From 6fefe836d465f2b1f045a73335c71403d7cc568f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ingo=20B=C3=BCrk?= Date: Mon, 4 Jan 2016 18:39:40 -0500 Subject: [PATCH] Fix memory leaks in title_format. This fixes three memory leaks that were found during the implementation of #2120 so that they can be fixed in a bugfix release. relates to #2143 --- include/util.h | 7 +++++++ src/util.c | 14 ++++++++++++++ src/window.c | 38 +++++++++++++++++++++++--------------- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/include/util.h b/include/util.h index 01f732ca..2667df89 100644 --- a/include/util.h +++ b/include/util.h @@ -130,6 +130,13 @@ void *memmem(const void *l, size_t l_len, const void *s, size_t s_len); #endif +/** + * Escapes the given string if a pango font is currently used. + * If the string has to be escaped, the input string will be free'd. + * + */ +char *pango_escape_markup(char *input); + /** * Starts an i3-nagbar instance with the given parameters. Takes care of * handling SIGCHLD and killing i3-nagbar when i3 exits. diff --git a/src/util.c b/src/util.c index 7a73011d..67dc5c92 100644 --- a/src/util.c +++ b/src/util.c @@ -332,6 +332,20 @@ void *memmem(const void *l, size_t l_len, const void *s, size_t s_len) { #endif +/* + * Escapes the given string if a pango font is currently used. + * If the string has to be escaped, the input string will be free'd. + * + */ +char *pango_escape_markup(char *input) { + if (!font_is_pango()) + return input; + + char *escaped = g_markup_escape_text(input, -1); + FREE(input); + return escaped; +} + /* * Handler which will be called when we get a SIGCHLD for the nagbar, meaning * it exited (or could not be started, depending on the exit code). diff --git a/src/window.c b/src/window.c index eba15632..f787e078 100644 --- a/src/window.c +++ b/src/window.c @@ -66,8 +66,12 @@ void window_update_name(i3Window *win, xcb_get_property_reply_t *prop, bool befo i3string_free(win->name); win->name = i3string_from_utf8_with_length(xcb_get_property_value(prop), xcb_get_property_value_length(prop)); - if (win->title_format != NULL) - ewmh_update_visible_name(win->id, i3string_as_utf8(window_parse_title_format(win))); + + if (win->title_format != NULL) { + i3String *name = window_parse_title_format(win); + ewmh_update_visible_name(win->id, i3string_as_utf8(name)); + I3STRING_FREE(name); + } win->name_x_changed = true; LOG("_NET_WM_NAME changed to \"%s\"\n", i3string_as_utf8(win->name)); @@ -106,8 +110,11 @@ void window_update_name_legacy(i3Window *win, xcb_get_property_reply_t *prop, bo i3string_free(win->name); win->name = i3string_from_utf8_with_length(xcb_get_property_value(prop), xcb_get_property_value_length(prop)); - if (win->title_format != NULL) - ewmh_update_visible_name(win->id, i3string_as_utf8(window_parse_title_format(win))); + if (win->title_format != NULL) { + i3String *name = window_parse_title_format(win); + ewmh_update_visible_name(win->id, i3string_as_utf8(name)); + I3STRING_FREE(name); + } LOG("WM_NAME changed to \"%s\"\n", i3string_as_utf8(win->name)); LOG("Using legacy window title. Note that in order to get Unicode window " @@ -340,18 +347,14 @@ void window_update_motif_hints(i3Window *win, xcb_get_property_reply_t *prop, bo * */ i3String *window_parse_title_format(i3Window *win) { - /* We need to ensure that we only escape the window title if pango - * is used by the current font. */ - const bool pango_markup = font_is_pango(); - char *format = win->title_format; if (format == NULL) return i3string_copy(win->name); /* We initialize these lazily so we only escape them if really necessary. */ - const char *escaped_title = NULL; - const char *escaped_class = NULL; - const char *escaped_instance = NULL; + char *escaped_title = NULL; + char *escaped_class = NULL; + char *escaped_instance = NULL; /* We have to first iterate over the string to see how much buffer space * we need to allocate. */ @@ -359,19 +362,19 @@ i3String *window_parse_title_format(i3Window *win) { for (char *walk = format; *walk != '\0'; walk++) { if (STARTS_WITH(walk, "%title")) { if (escaped_title == NULL) - escaped_title = win->name == NULL ? "" : i3string_as_utf8(pango_markup ? i3string_escape_markup(win->name) : win->name); + escaped_title = pango_escape_markup(sstrdup((win->name == NULL) ? "" : i3string_as_utf8(win->name))); buffer_len = buffer_len - strlen("%title") + strlen(escaped_title); walk += strlen("%title") - 1; } else if (STARTS_WITH(walk, "%class")) { if (escaped_class == NULL) - escaped_class = pango_markup ? g_markup_escape_text(win->class_class, -1) : win->class_class; + escaped_class = pango_escape_markup(sstrdup((win->class_class == NULL) ? "" : win->class_class)); buffer_len = buffer_len - strlen("%class") + strlen(escaped_class); walk += strlen("%class") - 1; } else if (STARTS_WITH(walk, "%instance")) { if (escaped_instance == NULL) - escaped_instance = pango_markup ? g_markup_escape_text(win->class_instance, -1) : win->class_instance; + escaped_instance = pango_escape_markup(sstrdup((win->class_instance == NULL) ? "" : win->class_instance)); buffer_len = buffer_len - strlen("%instance") + strlen(escaped_instance); walk += strlen("%instance") - 1; @@ -403,6 +406,11 @@ i3String *window_parse_title_format(i3Window *win) { *outwalk = '\0'; i3String *formatted = i3string_from_utf8(buffer); - i3string_set_markup(formatted, pango_markup); + i3string_set_markup(formatted, font_is_pango()); + + FREE(escaped_title); + FREE(escaped_class); + FREE(escaped_instance); + return formatted; } -- 2.39.5