r48960 - in /desktop/unstable/metacity/debian: changelog patches/fix_xerror_in_free_win.diff

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Tue May 31 10:51:57 2016
New Revision: 48960

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48960
Log:
Use one error trap for the whole free_win function (taken from upstream
gnome-3-18 branch, fixes another crash).

Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/patches/fix_xerror_in_free_win.diff

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=48960&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog	[utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog	[utf-8] Tue May 31 10:51:57 2016
@@ -1,3 +1,10 @@
+metacity (1:3.18.4-3) unstable; urgency=medium
+
+  * Use one error trap for the whole free_win function (taken from upstream
+    gnome-3-18 branch, fixes another crash).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 31 May 2016 13:48:06 +0300
+
 metacity (1:3.18.4-2) unstable; urgency=medium
 
   * Updates from upstream gnome-3-18 branch:

Modified: desktop/unstable/metacity/debian/patches/fix_xerror_in_free_win.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/fix_xerror_in_free_win.diff?rev=48960&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/patches/fix_xerror_in_free_win.diff	[utf-8] (original)
+++ desktop/unstable/metacity/debian/patches/fix_xerror_in_free_win.diff	[utf-8] Tue May 31 10:51:57 2016
@@ -2,21 +2,40 @@
  It seems that picture might be destroyed with window if it is
  created by passing window id as drawable to XRenderCreatePicture.
  .
- Add error trap around XRenderFreePicture to avoid Metacity crash
- with RenderBadPicture error.
-Origin: upstream, https://git.gnome.org/browse/metacity/commit/?id=1243d34816398ec9
-Last-Update: 2016-05-26
+ Replace existing trap with one that is added for whole function.
+Origin: upstream, commits
+ https://git.gnome.org/browse/metacity/commit/?id=1243d34816398ec9
+ https://git.gnome.org/browse/metacity/commit/?id=c4db0f8f9b001fcd
+Last-Update: 2016-05-31
 
 --- a/src/compositor/compositor-xrender.c
 +++ b/src/compositor/compositor-xrender.c
-@@ -1957,7 +1957,10 @@
+@@ -1942,6 +1942,8 @@
+   Display *xdisplay = meta_display_get_xdisplay (display);
+   MetaCompScreen *info = meta_screen_get_compositor_data (cw->screen);
  
-   if (cw->picture)
++  meta_error_trap_push (display);
++
+   /* See comment in map_win */
+   if (cw->back_pixmap && destroy)
      {
-+      meta_error_trap_push (display);
-       XRenderFreePicture (xdisplay, cw->picture);
-+      meta_error_trap_pop (display, FALSE);
+@@ -2036,10 +2038,7 @@
+   if (destroy)
+     {
+       if (cw->damage != None) {
+-        meta_error_trap_push (display);
+         XDamageDestroy (xdisplay, cw->damage);
+-        meta_error_trap_pop (display, FALSE);
+-
+         cw->damage = None;
+       }
+ 
+@@ -2050,6 +2049,8 @@
+ 
+       g_free (cw);
+     }
 +
-       cw->picture = None;
-     }
++  meta_error_trap_pop (display, FALSE);
+ }
  
+ static void