[cairo-commit] 2 commits - src/cairo-directfb-surface.c

[Michael Emmel]

 src/cairo-directfb-surface.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 8601c2c68306c956744399099a941363d446b906 (from parents)
Merge: cd2f50e6c421d35c3d5b0d76ed0fdd03a033b2c2 b7191885c88068dad57d68ced69a752d1162b12c
Author: Michael Emmel <memmel at debian.localdomain>
Date:   Thu Jul 20 23:04:37 2006 -0700

    Merge branch 'master' of ssh+git://git.cairographics.org/git/cairo

diff-tree cd2f50e6c421d35c3d5b0d76ed0fdd03a033b2c2 (from 5d64efdbb8fc4e17d4fa44d21068870cd2aea7ce)
Author: Michael Emmel <memmel at debian.localdomain>
Date:   Thu Jul 20 23:01:06 2006 -0700

    Check for zero before freeing region

diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index d18f625..b8d15ab 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -1106,7 +1106,8 @@ _cairo_directfb_surface_set_clip_region 
         int             i;
         
         if (surface->n_clips != n_boxes) {
-            free (surface->clips);
+            if( surface->clips )
+                free (surface->clips);
             
             surface->clips = malloc (n_boxes * sizeof(DFBRegion));
             if (!surface->clips) {