dwm: use ecalloc, prevent theoretical overflow - dwm - dynamic window manager
HTML git clone https://git.parazyd.org/dwm
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit e3b7e1d620e18818222c1e5033356ae29dd49e7f
DIR parent 04db03a4e69eba88c56c12128340125fb0ef1960
HTML Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Tue, 20 Oct 2015 23:30:31 +0200
dwm: use ecalloc, prevent theoretical overflow
Diffstat:
M dwm.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
---
DIR diff --git a/dwm.c b/dwm.c
@@ -630,8 +630,7 @@ Monitor *
createmon(void) {
Monitor *m;
- if(!(m = (Monitor *)calloc(1, sizeof(Monitor))))
- die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
+ m = ecalloc(1, sizeof(Monitor));
m->tagset[0] = m->tagset[1] = 1;
m->mfact = mfact;
m->nmaster = nmaster;
@@ -1007,8 +1006,7 @@ manage(Window w, XWindowAttributes *wa) {
Window trans = None;
XWindowChanges wc;
- if(!(c = calloc(1, sizeof(Client))))
- die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+ c = ecalloc(1, sizeof(Client));
c->win = w;
updatetitle(c);
if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
@@ -1788,8 +1786,7 @@ updategeom(void) {
for(n = 0, m = mons; m; m = m->next, n++);
/* only consider unique geometries as separate screens */
- if(!(unique = (XineramaScreenInfo *)malloc(sizeof(XineramaScreenInfo) * nn)))
- die("fatal: could not malloc() %u bytes\n", sizeof(XineramaScreenInfo) * nn);
+ unique = ecalloc(nn, sizeof(XineramaScreenInfo));
for(i = 0, j = 0; i < nn; i++)
if(isuniquegeom(unique, j, &info[i]))
memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));