Fix double free

dunst-project · Aug 17, 2024 · 4fe05fe · 4fe05fe
1 parent be4f1bd
commit 4fe05fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/notification.c b/src/notification.c
@@ -458,7 +458,6 @@ struct notification *notification_create(void)
         n->colors.fg = invalid;
         n->colors.bg = invalid;
         n->colors.frame = invalid;
-
         n->colors.highlight = NULL;
 
         n->script_run = false;

diff --git a/src/rules.c b/src/rules.c
@@ -241,6 +241,11 @@ void rule_free(struct rule *r)
         g_free(r->set_stack_tag);
         g_free(r->new_icon);
         g_free(r->name);
+
+        // Ugly but necessary
+        if (r->highlight != settings.colors_low.highlight &&
+            r->highlight != settings.colors_norm.highlight &&
+            r->highlight != settings.colors_crit.highlight)
         gradient_free(r->highlight);
 }
 

diff --git a/test/dbus.c b/test/dbus.c
@@ -760,7 +760,12 @@ TEST test_dbus_notify_colors(void)
 
         // Invalid color strings are ignored
         ASSERTm("Invalid color strings should not change the color struct", COLOR_SAME(n->colors.bg, settings.colors_norm.bg));
-        ASSERTm("Invalid color strings should not change the gradient struct", n->colors.highlight == settings.colors_norm.highlight);
+
+        ASSERTm("Invalid color strings should not change the gradient struct", n->colors.highlight->length == settings.colors_norm.highlight->length);
+
+        for (int i = 0; i < settings.colors_norm.highlight->length; i++)
+                ASSERTm("Invalid color strings should not change the gradient struct",
+                        COLOR_SAME(n->colors.highlight->colors[i], settings.colors_norm.highlight->colors[i]));
 
         dbus_notification_free(n_dbus);