Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
dwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved the memory leak prevention
[dwm.git]
/
main.c
diff --git
a/main.c
b/main.c
index
f196df7
..
cde7e46
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-51,6
+51,9
@@
cleanup(void) {
XFreePixmap(dpy, dc.drawable);
XFreeGC(dpy, dc.gc);
XDestroyWindow(dpy, barwin);
XFreePixmap(dpy, dc.drawable);
XFreeGC(dpy, dc.gc);
XDestroyWindow(dpy, barwin);
+ XFreeCursor(dpy, cursor[CurNormal]);
+ XFreeCursor(dpy, cursor[CurResize]);
+ XFreeCursor(dpy, cursor[CurMove]);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
XSync(dpy, False);
free(seltag);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
XSync(dpy, False);
free(seltag);
@@
-104,7
+107,7
@@
setup(void) {
numlockmask = (1 << i);
}
}
numlockmask = (1 << i);
}
}
- XFree(modmap);
+ XFreeModifiermap(modmap);
/* select for events */
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
| EnterWindowMask | LeaveWindowMask;
/* select for events */
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
| EnterWindowMask | LeaveWindowMask;
@@
-277,15
+280,16
@@
main(int argc, char *argv[]) {
switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
case -1:
strncpy(stext, strerror(errno), sizeof stext - 1);
switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
case -1:
strncpy(stext, strerror(errno), sizeof stext - 1);
+ stext[sizeof stext - 1] = '\0';
readin = False;
break;
case 0:
readin = False;
break;
case 0:
- strncpy(stext, "EOF", sizeof stext);
+ strncpy(stext, "EOF", 4);
readin = False;
break;
default:
readin = False;
break;
default:
- stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';
- for(p = stext + strlen(stext) - 1; p > stext && *p != '\n'; --p);
+ for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
+ for(p = stext + strlen(stext) - 1; p >= stext && *p != '\n'; --p);
if(p > stext)
strncpy(stext, p + 1, sizeof stext);
}
if(p > stext)
strncpy(stext, p + 1, sizeof stext);
}