[fusion-commits] compiz mirror: Changes to 'master' (ab0b6b5e47e7472ef9920fb2a89d1ee9f498760e)

[compiz at server.beryl-project.org]

New commits:
commit ab0b6b5e47e7472ef9920fb2a89d1ee9f498760e
Author: Roland Baer <roland at Vista.(none)>
Date:   Thu Aug 2 11:39:25 2007 -0400

    Various NULL checks


 plugins/ini.c   |    3 +++
 plugins/scale.c |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)


Modified: compiz/plugins/ini.c
===================================================================
--- compiz/plugins/ini.c
+++ compiz/plugins/ini.c
@@ -522,6 +522,9 @@ parseAction (CompDisplay *d,
 	int len = strlen (optionName) - strlen (optionType);
 	
 	action->realOptionName = malloc (sizeof (char) * (len+1));
+	if (!action->realOptionName)
+	    return FALSE;
+
 	strncpy (action->realOptionName, optionName, len);
 	action->realOptionName[len] = '\0';
 

Modified: compiz/plugins/scale.c
===================================================================
--- compiz/plugins/scale.c
+++ compiz/plugins/scale.c
@@ -1404,7 +1404,8 @@ scaleSelectWindow (CompWindow *w)
 	if (old)
 	    addWindowDamage (old);
 
-	addWindowDamage (new);
+	if (new)
+	    addWindowDamage (new);
     }
 }