* xterm.c (x_set_frame_alpha): Access data before it is free:d.

Make sure we don't do x_catch_errors twice.

diff --git a/src/ChangeLog b/src/ChangeLog
index 68a12d4f55acf6e8ec139c5111351b4cd321ac73..ba3bbb71b7e126da56d3ea6865369463c8ca5a48 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * 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  <rgm@gnu.org>
 
        * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.

diff --git a/src/xterm.c b/src/xterm.c
index 31f002fa05cc122bce1aaae2bebc44615367d478..52d79e8dad7ffe63d8eb3cffa1da3e1e8d591ea2 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -488,17 +488,16 @@ x_set_frame_alpha (struct frame *f)
 
     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);