r35394 - in /desktop/unstable/cogl/debian: changelog patches/04_fix_crash_on_free.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Thu Jun 21 07:29:20 2012
New Revision: 35394

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35394
Log:
* debian/patches/04_fix_crash_on_free.patch:
  + Added. Fix crash when freeing an unconnected renderer.
    (Closes: #673433 #676282)

Added:
    desktop/unstable/cogl/debian/patches/04_fix_crash_on_free.patch
Modified:
    desktop/unstable/cogl/debian/changelog
    desktop/unstable/cogl/debian/patches/series

Modified: desktop/unstable/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/changelog?rev=35394&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog [utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog [utf-8] Thu Jun 21 07:29:20 2012
@@ -2,8 +2,11 @@
 
   * debian/rules: Set the gles2-libname to libGLESv2.so.2 as shipped by Mesa
     (Closes: #678018)
+  * debian/patches/04_fix_crash_on_free.patch:
+    + Added. Fix crash when freeing an unconnected renderer.
+      (Closes: #673433 #676282)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 21 Jun 2012 09:12:00 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 21 Jun 2012 09:21:37 +0200
 
 cogl (1.10.2-5) unstable; urgency=low
 

Added: desktop/unstable/cogl/debian/patches/04_fix_crash_on_free.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/04_fix_crash_on_free.patch?rev=35394&op=file
==============================================================================
--- desktop/unstable/cogl/debian/patches/04_fix_crash_on_free.patch (added)
+++ desktop/unstable/cogl/debian/patches/04_fix_crash_on_free.patch [utf-8] Thu Jun 21 07:29:20 2012
@@ -1,0 +1,15 @@
+diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
+index b448483..60b102d 100644
+--- a/cogl/cogl-renderer.c
++++ b/cogl/cogl-renderer.c
+@@ -142,7 +142,9 @@ static void
+ _cogl_renderer_free (CoglRenderer *renderer)
+ {
+   const CoglWinsysVtable *winsys = _cogl_renderer_get_winsys (renderer);
+-  winsys->renderer_disconnect (renderer);
++
++  if (winsys)
++    winsys->renderer_disconnect (renderer);
+ 
+ #ifndef HAVE_DIRECTLY_LINKED_GL_LIBRARY
+   if (renderer->libgl_module)

Modified: desktop/unstable/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/series?rev=35394&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/patches/series [utf-8] (original)
+++ desktop/unstable/cogl/debian/patches/series [utf-8] Thu Jun 21 07:29:20 2012
@@ -1,1 +1,2 @@
 #02_disable_armv5t_specific_optimization.patch
+04_fix_crash_on_free.patch