pluma-view: Fix possible memory leak

sc0w · raveit65 · commit 06d6e5df6e66 · 2018-07-30T17:33:51.000+02:00
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c
@@ -675,7 +675,7 @@ contextmenu_font_changed_cb (GSettings *settings,
 	sys_font_desc = get_system_font ();
 	if (sys_font_desc)
 	{
-		pluma_override_font (".context-menu", GTK_WIDGET (user_data), sys_font_desc);
+		pluma_override_font (".context-menu", NULL, sys_font_desc);
 		pango_font_description_free (sys_font_desc);
 	}
 }
@@ -718,10 +718,13 @@ pluma_override_font (const gchar          *item,
 	{
 		if (strstr (prov_str, ".context-menu"))
 		{
-			prov_str = g_strdelimit (prov_str, "}", '\0');
-			prov_str = g_strdup_printf ("%s}", prov_str);
+			g_strdelimit (prov_str, "}", '\0');
+			gchar *prov_new_str = g_strdup_printf ("%s}", prov_str);
+			css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_new_str, item, family, weight, style, size);
+			g_free (prov_new_str);
 		}
-		css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_str, item, family, weight, style, size);
+		else
+			css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_str, item, family, weight, style, size);
 	}
 	else
 		css = g_strdup_printf ("%s { %s %s %s %s }", item, family, weight, style, size);

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ contextmenu_font_changed_cb (GSettings *settings,`
`675`	`675`	`sys_font_desc = get_system_font ();`
`676`	`676`	`if (sys_font_desc)`
`677`	`677`	`{`
`678`		`- pluma_override_font (".context-menu", GTK_WIDGET (user_data), sys_font_desc);`
	`678`	`+ pluma_override_font (".context-menu", NULL, sys_font_desc);`
`679`	`679`	`pango_font_description_free (sys_font_desc);`
`680`	`680`	`}`
`681`	`681`	`}`
`@@ -718,10 +718,13 @@ pluma_override_font (const gchar *item,`
`718`	`718`	`{`
`719`	`719`	`if (strstr (prov_str, ".context-menu"))`
`720`	`720`	`{`
`721`		`- prov_str = g_strdelimit (prov_str, "}", '\0');`
`722`		`- prov_str = g_strdup_printf ("%s}", prov_str);`
	`721`	`+ g_strdelimit (prov_str, "}", '\0');`
	`722`	`+ gchar *prov_new_str = g_strdup_printf ("%s}", prov_str);`
	`723`	`+ css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_new_str, item, family, weight, style, size);`
	`724`	`+ g_free (prov_new_str);`
`723`	`725`	`}`
`724`		`- css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_str, item, family, weight, style, size);`
	`726`	`+ else`
	`727`	`+ css = g_strdup_printf ("%s %s { %s %s %s %s }", prov_str, item, family, weight, style, size);`
`725`	`728`	`}`
`726`	`729`	`else`
`727`	`730`	`css = g_strdup_printf ("%s { %s %s %s %s }", item, family, weight, style, size);`