caja-information-panel: Fix use of memory after it is freed

sc0w · sc0w · commit 7c9ae01aaee4 · 2019-03-05T01:19:53.000+01:00
to avoid warning with Clang Analyzer
diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c
@@ -945,6 +945,9 @@ add_buttons_from_metadata (CajaInformationPanel *information_panel, const char *
             *temp_str = '\0';
             if (!g_ascii_strcasecmp (current_term, "button"))
             {
+                if (button_name)
+                    g_free (button_name);
+
                 button_name = g_strdup (temp_str + 1);
             }
             else if (!g_ascii_strcasecmp (current_term, "script"))
@@ -958,7 +961,6 @@ add_buttons_from_metadata (CajaInformationPanel *information_panel, const char *
                                         0);
                     information_panel->details->has_buttons = TRUE;
                     command_string = g_strdup (temp_str + 1);
-                    g_free (button_name);
 
                     g_signal_connect_data (temp_button,
                                            "clicked",
@@ -975,6 +977,7 @@ add_buttons_from_metadata (CajaInformationPanel *information_panel, const char *
         }
         g_free(current_term);
     }
+    g_free (button_name);
     g_strfreev (terms);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -945,6 +945,9 @@ add_buttons_from_metadata (CajaInformationPanel information_panel, const char `
`945`	`945`	`*temp_str = '\0';`
`946`	`946`	`if (!g_ascii_strcasecmp (current_term, "button"))`
`947`	`947`	`{`
	`948`	`+ if (button_name)`
	`949`	`+ g_free (button_name);`
	`950`	`+`
`948`	`951`	`button_name = g_strdup (temp_str + 1);`
`949`	`952`	`}`
`950`	`953`	`else if (!g_ascii_strcasecmp (current_term, "script"))`
`@@ -958,7 +961,6 @@ add_buttons_from_metadata (CajaInformationPanel information_panel, const char `
`958`	`961`	`0);`
`959`	`962`	`information_panel->details->has_buttons = TRUE;`
`960`	`963`	`command_string = g_strdup (temp_str + 1);`
`961`		`- g_free (button_name);`
`962`	`964`
`963`	`965`	`g_signal_connect_data (temp_button,`
`964`	`966`	`"clicked",`
`@@ -975,6 +977,7 @@ add_buttons_from_metadata (CajaInformationPanel information_panel, const char `
`975`	`977`	`}`
`976`	`978`	`g_free(current_term);`
`977`	`979`	`}`
	`980`	`+ g_free (button_name);`
`978`	`981`	`g_strfreev (terms);`
`979`	`982`	`}`
`980`	`983`