Merge pull request #2016 from clumens/leaks

Fix memory leaks

Author: Ken Gaillot

lib/common/cmdline.c

@@ -142,13 +142,15 @@ pcmk__add_arg_group(GOptionContext *context, const char *name,
 gchar **
 pcmk__cmdline_preproc(char **argv, const char *special) {
     gchar **retval = NULL;
-    GPtrArray *arr = g_ptr_array_new();
+    GPtrArray *arr = NULL;
     bool saw_dash_dash = false;
 
     if (argv == NULL) {
         return retval;
     }
 
+    arr = g_ptr_array_new();
+
     for (int i = 0; argv[i] != NULL; i++) {
         /* If this is the first time we saw "--" in the command line, set
          * a flag so we know to just copy everything after it over.  We also

tools/crm_diff.c

@@ -332,7 +332,10 @@ main(int argc, char **argv)
     }
 
     if (optind > argc) {
-        fprintf(stderr, "%s", g_option_context_get_help(context, TRUE, NULL));
+        char *help = g_option_context_get_help(context, TRUE, NULL);
+
+        fprintf(stderr, "%s", help);
+        free(help);
         rc = CRM_EX_USAGE;
         goto done;
     }

tools/crm_mon.c

@@ -63,6 +63,7 @@ static unsigned int show;
 static mon_output_format_t output_format = mon_output_unset;
 
 /* other globals */
+static GIOChannel *io_channel = NULL;
 static GMainLoop *mainloop = NULL;
 static guint timer_id = 0;
 static mainloop_timer_t *refresh_timer = NULL;
@@ -1377,14 +1378,20 @@ main(int argc, char **argv)
         if (ncurses_winch_handler == SIG_DFL ||
             ncurses_winch_handler == SIG_IGN || ncurses_winch_handler == SIG_ERR)
             ncurses_winch_handler = NULL;
-        g_io_add_watch(g_io_channel_unix_new(STDIN_FILENO), G_IO_IN, detect_user_input, NULL);
+
+        io_channel = g_io_channel_unix_new(STDIN_FILENO);
+        g_io_add_watch(io_channel, G_IO_IN, detect_user_input, NULL);
     }
 #endif
     refresh_trigger = mainloop_add_trigger(G_PRIORITY_LOW, mon_refresh_display, NULL);
 
     g_main_loop_run(mainloop);
     g_main_loop_unref(mainloop);
 
+    if (io_channel != NULL) {
+        g_io_channel_shutdown(io_channel, TRUE, NULL);
+    }
+
     crm_info("Exiting %s", crm_system_name);
 
     return clean_up(CRM_EX_OK);
@@ -2119,7 +2126,10 @@ clean_up(crm_exit_t exit_code)
      * message.
      */
     if (exit_code == CRM_EX_USAGE && (output_format == mon_output_console || output_format == mon_output_plain)) {
-        fprintf(stderr, "%s", g_option_context_get_help(context, TRUE, NULL));
+        char *help = g_option_context_get_help(context, TRUE, NULL);
+
+        fprintf(stderr, "%s", help);
+        free(help);
     }
 
     pcmk__free_arg_context(context);

tools/crm_node.c

@@ -623,7 +623,10 @@ main(int argc, char **argv)
     }
 
     if (optind > argc || options.command == 0) {
-        fprintf(stderr, "%s", g_option_context_get_help(context, TRUE, NULL));
+        char *help = g_option_context_get_help(context, TRUE, NULL);
+
+        fprintf(stderr, "%s", help);
+        free(help);
         exit_code = CRM_EX_USAGE;
         goto done;
     }

tools/crm_rule.c

@@ -238,7 +238,10 @@ main(int argc, char **argv)
     }
 
     if (optind > argc) {
-        CMD_ERR("%s", g_option_context_get_help(context, TRUE, NULL));
+        char *help = g_option_context_get_help(context, TRUE, NULL);
+
+        CMD_ERR("%s", help);
+        free(help);
         exit_code = CRM_EX_USAGE;
         goto bail;
     }

tools/stonith_admin.c

@@ -473,14 +473,20 @@ main(int argc, char **argv)
     }
 
     if (optind > argc || action == 0) {
-        out->err(out, "%s", g_option_context_get_help(context, TRUE, NULL));
+        char *help = g_option_context_get_help(context, TRUE, NULL);
+
+        out->err(out, "%s", help);
+        free(help);
         exit_code = CRM_EX_USAGE;
         goto done;
     }
 
     if (required_agent && options.agent == NULL) {
+        char *help = g_option_context_get_help(context, TRUE, NULL);
+
         out->err(out, "Please specify an agent to query using -a,--agent [value]");
-        out->err(out, "%s", g_option_context_get_help(context, TRUE, NULL));
+        out->err(out, "%s", help);
+        free(help);
         exit_code = CRM_EX_USAGE;
         goto done;
     }