Fix double free

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

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/src/draw.c b/src/draw.c
@@ -115,6 +115,17 @@ void gradient_pattern(struct gradient *grad)
         }
 }
 
+struct gradient *gradient_copy(const struct gradient *grad)
+{
+        if (grad == NULL)
+                return NULL;
+
+        struct gradient *copy = gradient_alloc(grad->length);
+        memcpy(copy->colors, grad->colors, grad->length * sizeof(struct color));
+        gradient_pattern(copy);
+        return copy;
+}
+
 char *gradient_to_string(const struct gradient *grad)
 {
         if (!GRADIENT_VALID(grad)) return NULL;

diff --git a/src/draw.h b/src/draw.h
@@ -67,6 +67,8 @@ void gradient_free(struct gradient *grad);
 
 void gradient_pattern(struct gradient *grad);
 
+struct gradient *gradient_copy(const struct gradient *grad);
+
 char *gradient_to_string(const struct gradient *grad);
 
 

diff --git a/src/notification.c b/src/notification.c
@@ -513,7 +513,7 @@ void notification_init(struct notification *n)
         if (!COLOR_VALID(n->colors.bg)) n->colors.bg = defcolors.bg;
         if (!COLOR_VALID(n->colors.frame)) n->colors.frame = defcolors.frame;
 
-        if (!GRADIENT_VALID(n->colors.highlight)) n->colors.highlight = defcolors.highlight;
+        if (!GRADIENT_VALID(n->colors.highlight)) n->colors.highlight = gradient_copy(defcolors.highlight);
 
         /* Sanitize misc hints */
         if (n->progress < 0)

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);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,6 +67,8 @@ void gradient_free(struct gradient *grad);

		void gradient_pattern(struct gradient *grad);

		struct gradient gradient_copy(const struct gradient grad);

		char gradient_to_string(const struct gradient grad);


Expand Down