[maemo-commits] [maemo-commits] r17584 - in projects/haf/trunk/clutter: clutter/cogl/gles debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-03-04 13:51:43 +0200 (Wed, 04 Mar 2009)
New Revision: 17584

Modified:
   projects/haf/trunk/clutter/clutter/cogl/gles/cogl-texture.c
   projects/haf/trunk/clutter/debian/changelog
Log:
 Fixed possible double-free in cogl_texture_set_region


Modified: projects/haf/trunk/clutter/clutter/cogl/gles/cogl-texture.c
===================================================================
--- projects/haf/trunk/clutter/clutter/cogl/gles/cogl-texture.c	2009-03-04 08:51:48 UTC (rev 17583)
+++ projects/haf/trunk/clutter/clutter/cogl/gles/cogl-texture.c	2009-03-04 11:51:43 UTC (rev 17584)
@@ -1642,8 +1642,10 @@
 
       /* Swap bitmaps if succeeded */
       if (!success) return FALSE;
+
+      if (source_bmp.data != temp_bmp.data)
+        source_bmp_owner = TRUE;
       source_bmp = temp_bmp;
-      source_bmp_owner = TRUE;
     }
 
   /* Send data to GL */

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-03-04 08:51:48 UTC (rev 17583)
+++ projects/haf/trunk/clutter/debian/changelog	2009-03-04 11:51:43 UTC (rev 17584)
@@ -11,6 +11,7 @@
     is set correctly even when drawing colour using arrays
   * added small speedup to PVRTC
   * Modified timeline priority to ensure that animation happens before redraws
+  * Fixed possible double-free in cogl_texture_set_region
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon,  2 Mar 2009 09:37:27 +0200