Bug #2391: Fix a use-after-free in run_fades. (Jonathan Briggs)

[dana/xcompmgr.git] / xcompmgr.c

diff --git a/xcompmgr.c b/xcompmgr.c
index 8eaa0a2..32e125d 100644 (file)
--- a/xcompmgr.c
+++ b/xcompmgr.c
@@ -322,6 +322,7 @@ run_fades (Display *dpy)
     int            now = get_time_in_milliseconds();
     fade    *f, *next;
     int            steps;
+    Bool    need_dequeue;
 
 #if 0
     printf ("run fades\n");
@@ -342,12 +343,13 @@ run_fades (Display *dpy)
        printf ("opacity now %g\n", f->cur);
 #endif
        w->opacity = f->cur * OPAQUE;
+       need_dequeue = False;
        if (f->step > 0)
        {
            if (f->cur >= f->finish)
            {
                w->opacity = f->finish*OPAQUE;
-               dequeue_fade (dpy, f);
+               need_dequeue = True;
            }
        }
        else
@@ -355,7 +357,7 @@ run_fades (Display *dpy)
            if (f->cur <= f->finish)
            {
                w->opacity = f->finish*OPAQUE;
-               dequeue_fade (dpy, f);
+               need_dequeue = True;
            }
        }
        determine_mode (dpy, w);
@@ -365,6 +367,9 @@ run_fades (Display *dpy)
            w->shadow = None;
            w->extents = win_extents(dpy, w);
        }
+       /* Must do this last as it might destroy f->w in callbacks */
+       if (need_dequeue)
+               dequeue_fade (dpy, f);
     }
     fade_time = now + fade_delta;
 }
@@ -942,6 +947,10 @@ paint_all (Display *dpy, XserverRegion region)
        /* never painted, ignore it */
        if (!w->damaged)
            continue;
+       /* if invisible, ignore it */
+       if (w->a.x + w->a.width < 1 || w->a.y + w->a.height < 1
+           || w->a.x >= root_width || w->a.y >= root_height)
+           continue;
        if (!w->picture)
        {
            XRenderPictureAttributes    pa;
@@ -1030,6 +1039,9 @@ paint_all (Display *dpy, XserverRegion region)
        case CompSimple:
            break;
        case CompServerShadows:
+           /* dont' bother drawing shadows on desktop windows */
+           if (w->windowType == winDesktopAtom)
+               break;
            set_ignore (dpy, NextRequest (dpy));
            if (w->opacity != OPAQUE && !w->shadowPict)
                w->shadowPict = solid_picture (dpy, True,
@@ -1044,7 +1056,8 @@ paint_all (Display *dpy, XserverRegion region)
                              w->shadow_width, w->shadow_height);
            break;
        case CompClientShadows:
-           if (w->shadow)
+           /* don't bother drawing shadows on desktop windows */
+           if (w->shadow && w->windowType != winDesktopAtom)
            {
                XRenderComposite (dpy, PictOpOver, blackPicture, w->shadow, rootBuffer,
                                  0, 0, 0, 0,
@@ -1825,7 +1838,7 @@ ev_window (XEvent *ev)
 void
 usage (char *program)
 {
-    fprintf (stderr, "%s v1.1\n", program);
+    fprintf (stderr, "%s v1.1.2\n", program);
     fprintf (stderr, "usage: %s [options]\n", program);
     fprintf (stderr, "Options\n");
     fprintf (stderr, "   -d display\n      Specifies which display should be managed.\n");