Fix memory leak colors given via hints

The hints given via DBus are not constants. Therefore those colors have to get freed. As this is not possible, we have to duplicate the strings when setting.
dunst-project · Nov 6, 2017 · e3238c6 · e3238c6
1 parent f8824d6
commit e3238c6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/notification.c b/src/notification.c
@@ -208,6 +208,9 @@ void notification_free(notification *n)
         g_free(n->category);
         g_free(n->text_to_render);
         g_free(n->urls);
+        g_free(n->colors[ColFG]);
+        g_free(n->colors[ColBG]);
+        g_free(n->colors[ColFrame]);
 
         actions_free(n->actions);
         rawimage_free(n->raw_icon);
@@ -348,13 +351,13 @@ void notification_init(notification *n)
         /* Color hints */
         n->colors[ColFG] = n->colors[ColFG]
                          ? n->colors[ColFG]
-                         : xctx.colors[ColFG][n->urgency];
+                         : g_strdup(xctx.colors[ColFG][n->urgency]);
         n->colors[ColBG] = n->colors[ColBG]
                          ? n->colors[ColBG]
-                         : xctx.colors[ColBG][n->urgency];
+                         : g_strdup(xctx.colors[ColBG][n->urgency]);
         n->colors[ColFrame] = n->colors[ColFrame]
                             ? n->colors[ColFrame]
-                            : xctx.colors[ColFrame][n->urgency];
+                            : g_strdup(xctx.colors[ColFrame][n->urgency]);
 
         /* Sanitize misc hints */
         if (n->progress < 0 || n->progress > 100)

diff --git a/src/notification.h b/src/notification.h
@@ -50,8 +50,8 @@ typedef struct _notification {
 
         enum markup_mode markup;
         const char *format;
-        const char *colors[3];
         const char *script;
+        char *colors[3];
 
         /* Hints */
         bool transient;     /* timeout albeit user is idle */

diff --git a/src/rules.c b/src/rules.c
@@ -28,10 +28,14 @@ void rule_apply(rule_t *r, notification *n)
                 rawimage_free(n->raw_icon);
                 n->raw_icon = NULL;
         }
-        if (r->fg)
-                n->colors[ColFG] = r->fg;
-        if (r->bg)
-                n->colors[ColBG] = r->bg;
+        if (r->fg) {
+                g_free(n->colors[ColFG]);
+                n->colors[ColFG] = g_strdup(r->fg);
+        }
+        if (r->bg) {
+                g_free(n->colors[ColBG]);
+                n->colors[ColBG] = g_strdup(r->bg);
+        }
         if (r->format)
                 n->format = r->format;
         if (r->script)