applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No memcpy on class change.

Browse Source
This commit is contained in:
Michael Hofmann 2015-03-30 12:02:39 +02:00
parent 0319bda1d4
commit f2542fc413
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/window.c
View File

@ -27,30 +27,27 @@ void window_update_class(i3Window *win, xcb_get_property_reply_t *prop, bool bef
* null-terminated strings (for compatibility reasons). Instead, we * null-terminated strings (for compatibility reasons). Instead, we
* use strdup() on both strings */ * use strdup() on both strings */
const size_t prop_length = xcb_get_property_value_length(prop); const size_t prop_length = xcb_get_property_value_length(prop);
char *new_class = smalloc(prop_length + 1); char *new_class = xcb_get_property_value(prop);
memcpy(new_class, xcb_get_property_value(prop), prop_length); const size_t class_class_index = strnlen(new_class, prop_length) + 1;
new_class[prop_length] = '\0';
FREE(win->class_instance); FREE(win->class_instance);
FREE(win->class_class); FREE(win->class_class);
win->class_instance = sstrdup(new_class); win->class_instance = sstrndup(new_class, prop_length);
if ((strlen(new_class) + 1) < prop_length) if (class_class_index < prop_length)
win->class_class = sstrdup(new_class + strlen(new_class) + 1); win->class_class = sstrndup(new_class + class_class_index, prop_length - class_class_index);
else else
win->class_class = NULL; win->class_class = NULL;
LOG("WM_CLASS changed to %s (instance), %s (class)\n", LOG("WM_CLASS changed to %s (instance), %s (class)\n",
win->class_instance, win->class_class); win->class_instance, win->class_class);
if (before_mgmt) { if (before_mgmt) {
free(new_class);
free(prop); free(prop);
return; return;
} }
run_assignments(win); run_assignments(win);
free(new_class);
free(prop); free(prop);
} }