Bugfix: Correctly check asprintf() return value

diff --git a/src/window.c b/src/window.c
index 6555be37b00a3507194cf23f81009e7954d83c2a..82c881a405aad1ebbd609ac24664a5ba5b29ac84 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -51,12 +51,21 @@ void window_update_name(i3Window *win, xcb_get_property_reply_t *prop) {
                  (char*)xcb_get_property_value(prop)) == -1) {
         perror("asprintf()");
         DLOG("Could not get window name\n");
+        return;
     }
     /* Convert it to UCS-2 here for not having to convert it later every time we want to pass it to X */
+    int len;
+    char *ucs2_name = convert_utf8_to_ucs2(new_name, &len);
+    if (ucs2_name == NULL) {
+        LOG("Could not convert _NET_WM_NAME to UCS-2, ignoring new hint\n");
+        FREE(new_name);
+        return;
+    }
     FREE(win->name_x);
     FREE(win->name_json);
     win->name_json = new_name;
-    win->name_x = convert_utf8_to_ucs2(win->name_json, &win->name_len);
+    win->name_x = ucs2_name;
+    win->name_len = len;
     LOG("_NET_WM_NAME changed to \"%s\"\n", win->name_json);
 
     win->uses_net_wm_name = true;