Added tag 5.2 for changeset e4bcaca8e6ef

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 965d1e3..09f3ae1 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -846,12 +846,14 @@ killclient(const Arg *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
 
 void
 manage(Window w, XWindowAttributes *wa) {

+       static Client cz;

        Client *c, *t = NULL;
        Window trans = None;
        XWindowChanges wc;
 
        Client *c, *t = NULL;
        Window trans = None;
        XWindowChanges wc;
 

-       if(!(c = calloc(1, sizeof(Client))))
-               die("fatal: could not calloc() %u bytes\n", sizeof(Client));
+       if(!(c = malloc(sizeof(Client))))
+               die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+       *c = cz;

        c->win = w;
 
        /* geometry */
        c->win = w;
 
        /* geometry */


@@ -1590,7 +1592,9 @@ updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 

-       XGetWMNormalHints(dpy, c->win, &size, &msize);
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+               /* size is uninitialized, ensure that size.flags aren't used */
+               size.flags = PSize; 

        if(size.flags & PBaseSize) {
                c->basew = size.base_width;
                c->baseh = size.base_height;
        if(size.flags & PBaseSize) {
                c->basew = size.base_width;
                c->baseh = size.base_height;