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

[compiz at server.beryl-project.org]

New commits:
commit 96f9b2e17031dcd6fcdc7f0a576a9131f68ef748
Author: Roland Baer <roland at Vista.(none)>
Date:   Thu Jul 19 11:43:07 2007 +0300

    Unsigned less than zero

commit 949515630964d55541a820e2473eed3b52256ba5
Author: Roland Baer <roland at Vista.(none)>
Date:   Thu Jul 19 11:10:03 2007 +0300

    Null checks to prevent crashs


 src/screen.c |    6 ++++++
 src/window.c |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


Modified: compiz/src/screen.c
===================================================================
--- compiz/src/screen.c
+++ compiz/src/screen.c
@@ -465,6 +465,9 @@ setScreenOption (CompScreen      *screen,
 	    vsize = compFindOption (screen->opt, NUM_OPTIONS (screen),
 				    "vsize", NULL);
 
+	    if (!vsize)
+		return FALSE;
+
 	    if (o->value.i * screen->width > MAXSHORT)
 		return FALSE;
 
@@ -480,6 +483,9 @@ setScreenOption (CompScreen      *screen,
 	    hsize = compFindOption (screen->opt, NUM_OPTIONS (screen),
 				    "hsize", NULL);
 
+	    if (!hsize)
+		return FALSE;
+
 	    if (o->value.i * screen->height > MAXSHORT)
 		return FALSE;
 

Modified: compiz/src/window.c
===================================================================
--- compiz/src/window.c
+++ compiz/src/window.c
@@ -2048,7 +2048,7 @@ addWindow (CompScreen *screen,
 					w->desktop);
 	    if (w->desktop != 0xffffffff)
 	    {
-		if (w->desktop < 0 || w->desktop >= screen->nDesktop)
+		if (w->desktop >= screen->nDesktop)
 		    w->desktop = screen->currentDesktop;
 	    }
 
@@ -4745,7 +4745,7 @@ setDesktopForWindow (CompWindow   *w,
 	if (w->type & (CompWindowTypeDesktopMask | CompWindowTypeDockMask))
 	    return;
 
-	if (desktop < 0 || desktop >= w->screen->nDesktop)
+	if (desktop >= w->screen->nDesktop)
 	    return;
     }