Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better allocation
[spectrwm.git]
/
spectrwm.c
diff --git
a/spectrwm.c
b/spectrwm.c
index
0980dd5
..
7291eb1
100644
(file)
--- a/
spectrwm.c
+++ b/
spectrwm.c
@@
-1526,7
+1526,7
@@
bar_window_name(char *s, size_t sz, struct swm_region *r)
if ((title = get_win_name(r->ws->focus->id)) == NULL)
return;
if ((title = get_win_name(r->ws->focus->id)) == NULL)
return;
- strlcat(s, (char *)title, sz);
+ strlcat(s, title, sz);
free(title);
}
free(title);
}
@@
-3738,12
+3738,12
@@
get_win_name(xcb_window_t win)
c = xcb_icccm_get_wm_name(conn, win);
if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
c = xcb_icccm_get_wm_name(conn, win);
if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
- name = malloc((r.name_len + 1) * sizeof(char *));
+ name = malloc(1, r.name_len + 1);
if (!name) {
xcb_get_text_property_reply_wipe(&r);
return (NULL);
}
if (!name) {
xcb_get_text_property_reply_wipe(&r);
return (NULL);
}
- memcpy(name, r.name, r.name_len * sizeof(char *));
+ memcpy(name, r.name, r.name_len);
name[r.name_len] = '\0';
}
name[r.name_len] = '\0';
}