From f92606a31750ef81dcef976bdf223b823699da4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Wed, 24 Apr 2024 23:14:26 +0200
Subject: [PATCH] charset: remove check of NULL pointers before calling free()
 (issue #865)

---
 src/plugins/charset/charset.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/plugins/charset/charset.c b/src/plugins/charset/charset.c
index ce87d5301..790356e46 100644
--- a/src/plugins/charset/charset.c
+++ b/src/plugins/charset/charset.c
@@ -542,8 +542,7 @@ charset_command_cb (const void *pointer, void *data,
                                 _("%s%s: wrong charset type (decode or encode "
                                   "expected)"),
                                 weechat_prefix ("error"), CHARSET_PLUGIN_NAME);
-                if (option_name)
-                    free (option_name);
+                free (option_name);
                 return WEECHAT_RC_OK;
             }
         }
@@ -556,8 +555,7 @@ charset_command_cb (const void *pointer, void *data,
                             _("%s%s: invalid charset: \"%s\""),
                             weechat_prefix ("error"), CHARSET_PLUGIN_NAME,
                             ptr_charset);
-            if (option_name)
-                free (option_name);
+            free (option_name);
             return WEECHAT_RC_OK;
         }
         if (ptr_section)
@@ -641,16 +639,11 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     weechat_config_free (charset_config_file);
     charset_config_file = NULL;
 
-    if (charset_terminal)
-    {
-        free (charset_terminal);
-        charset_terminal = NULL;
-    }
-    if (charset_internal)
-    {
-        free (charset_internal);
-        charset_internal = NULL;
-    }
+    free (charset_terminal);
+    charset_terminal = NULL;
+
+    free (charset_internal);
+    charset_internal = NULL;
 
     return WEECHAT_RC_OK;
 }