[beryl-commits] compiz mirror: Changes to 'master' (bfe921c590b6f2ca4bcc97b8ad888c8e89874a81)

[compiz at server.beryl-project.org]

New commits:
commit bfe921c590b6f2ca4bcc97b8ad888c8e89874a81
Merge: a3e4204572720e7a4473c8b299412217eb3eb58d 37d0dd7842277bed19dea4e860cf2c13ac208059
Author: David Reveman <davidr at novell.com>
Date:   Thu Jun 21 13:21:41 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit a3e4204572720e7a4473c8b299412217eb3eb58d
Author: David Reveman <davidr at novell.com>
Date:   Thu Jun 21 13:02:23 2007 -0400

    Fix memory leak.

commit d2a4e29405af135b1429751d3507a921737e51e8
Author: David Reveman <davidr at novell.com>
Date:   Thu Jun 21 12:58:42 2007 -0400

    Fix memory leak.

commit df9da5f4953425e8eac8c7722fe070b5aa928ec2
Author: David Reveman <davidr at novell.com>
Date:   Thu Jun 21 12:57:55 2007 -0400

    Fix memory leak.


 plugins/blur.c   |    3 +++
 plugins/dbus.c   |    2 ++
 plugins/wobbly.c |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)


Modified: compiz/plugins/blur.c
===================================================================
--- compiz/plugins/blur.c
+++ compiz/plugins/blur.c
@@ -2698,7 +2698,10 @@ blurInitWindow (CompPlugin *p,
 
     bw->clip = XCreateRegion ();
     if (!bw->clip)
+    {
+	free (bw);
 	return FALSE;
+    }
 
     w->privates[bs->windowPrivateIndex].ptr = bw;
 

Modified: compiz/plugins/dbus.c
===================================================================
--- compiz/plugins/dbus.c
+++ compiz/plugins/dbus.c
@@ -2162,6 +2162,8 @@ dbusUnregisterOptions (DBusConnection *connection,
 
     option = dbusGetOptionsFromPath (d, &path[3], NULL, NULL, &nOptions);
 
+    free (path);
+
     if (!option)
 	return FALSE;
 

Modified: compiz/plugins/wobbly.c
===================================================================
--- compiz/plugins/wobbly.c
+++ compiz/plugins/wobbly.c
@@ -1135,7 +1135,10 @@ createModel (int	  x,
     model->numObjects = GRID_WIDTH * GRID_HEIGHT;
     model->objects = malloc (sizeof (Object) * model->numObjects);
     if (!model->objects)
+    {
+	free (model);
 	return 0;
+    }
 
     model->anchorObject = 0;
     model->numSprings = 0;