BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Adam Jackson 2005-01-27 21:03:39 +00:00
parent 840fa5f33c
commit ea0f58928c
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-01-27 Adam Jackson <ajax@freedesktop.org>
* xcompmgr.c:
Bug #2391: Fix a use-after-free in run_fades. (Jonathan Briggs)
* configure.ac:
Bump to 1.1.2.
2005-01-26 Eric Anholt <anholt@FreeBSD.org> 2005-01-26 Eric Anholt <anholt@FreeBSD.org>
* Makefile.am: * Makefile.am:

2
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([xcompmgr], [1.1.1], [xorg@freedesktop.org]) AC_INIT([xcompmgr], [1.1.2], [xorg@freedesktop.org])
AC_CONFIG_SRCDIR([xcompmgr.c]) AC_CONFIG_SRCDIR([xcompmgr.c])
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

11
xcompmgr.c
View File

@ -322,6 +322,7 @@ run_fades (Display *dpy)
int now = get_time_in_milliseconds(); int now = get_time_in_milliseconds();
fade *f, *next; fade *f, *next;
int steps; int steps;
Bool need_dequeue;
#if 0 #if 0
printf ("run fades\n"); printf ("run fades\n");
@ -342,12 +343,13 @@ run_fades (Display *dpy)
printf ("opacity now %g\n", f->cur); printf ("opacity now %g\n", f->cur);
#endif #endif
w->opacity = f->cur * OPAQUE; w->opacity = f->cur * OPAQUE;
need_dequeue = False;
if (f->step > 0) if (f->step > 0)
{ {
if (f->cur >= f->finish) if (f->cur >= f->finish)
{ {
w->opacity = f->finish*OPAQUE; w->opacity = f->finish*OPAQUE;
dequeue_fade (dpy, f); need_dequeue = True;
} }
} }
else else
@ -355,7 +357,7 @@ run_fades (Display *dpy)
if (f->cur <= f->finish) if (f->cur <= f->finish)
{ {
w->opacity = f->finish*OPAQUE; w->opacity = f->finish*OPAQUE;
dequeue_fade (dpy, f); need_dequeue = True;
} }
} }
determine_mode (dpy, w); determine_mode (dpy, w);
@ -365,6 +367,9 @@ run_fades (Display *dpy)
w->shadow = None; w->shadow = None;
w->extents = win_extents(dpy, w); 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; fade_time = now + fade_delta;
} }
@ -1833,7 +1838,7 @@ ev_window (XEvent *ev)
void void
usage (char *program) usage (char *program)
{ {
fprintf (stderr, "%s v1.1.1\n", program); fprintf (stderr, "%s v1.1.2\n", program);
fprintf (stderr, "usage: %s [options]\n", program); fprintf (stderr, "usage: %s [options]\n", program);
fprintf (stderr, "Options\n"); fprintf (stderr, "Options\n");
fprintf (stderr, " -d display\n Specifies which display should be managed.\n"); fprintf (stderr, " -d display\n Specifies which display should be managed.\n");