[Emacs-diffs] /srv/bzr/emacs/trunk r103225: * xterm.c (x_set_frame_alpha): Access data before it is free:d.

[Jan D.]

------------------------------------------------------------
revno: 103225
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2011-02-11 16:40:19 +0100
message:
  * xterm.c (x_set_frame_alpha): Access data before it is free:d.
  Make sure we don't do x_catch_errors twice.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-10 03:20:52 +0000
+++ b/src/ChangeLog     2011-02-11 15:40:19 +0000
@@ -1,3 +1,8 @@
+2011-02-11  Jan Djärv  <address@hidden>
+
+       * xterm.c (x_set_frame_alpha): Access data before it is free:d.
+       Make sure we don't do x_catch_errors twice.
+
 2011-02-10  Glenn Morris  <address@hidden>
 
        * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2011-02-06 03:13:16 +0000
+++ b/src/xterm.c       2011-02-11 15:40:19 +0000
@@ -488,17 +488,16 @@
 
     if (rc == Success && actual != None)
       {
+        unsigned long value = *(unsigned long *)data;
        XFree ((void *) data);
-       if (*(unsigned long *)data == opac)
+       if (value == opac)
          {
            x_uncatch_errors ();
            return;
          }
       }
-    x_uncatch_errors ();
   }
 
-  x_catch_errors (dpy);
   XChangeProperty (dpy, win, dpyinfo->Xatom_net_wm_window_opacity,
                   XA_CARDINAL, 32, PropModeReplace,
                   (unsigned char *) &opac, 1L);