From: Rob Bradford <rob@linux.intel.com>
Date: Mon, 13 Aug 2012 14:18:44 +0000 (+0100)
Subject: shell: Avoid modulo by zero error in positioning algorithm
X-Git-Tag: submit/trunk/20120814.155504~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cb88c79e0277579fc36a152653dc1efe2cdf6c9;p=profile%2Fivi%2Fweston.git

shell: Avoid modulo by zero error in positioning algorithm

As spotted by Philipp Brüschweiler <blei42@gmail.com>
---

diff --git a/src/shell.c b/src/shell.c
index 9d969ff..4633049 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -2636,15 +2636,15 @@ weston_surface_set_initial_position (struct weston_surface *surface,
 	range_y = (target_output->current->height - panel_height) -
 		  surface->geometry.height;
 
-	if (range_x < 0)
-		dx = 0;
-	else
+	if (range_x > 0)
 		dx = random() % range_x;
-
-	if (range_y < 0)
-		dy = panel_height;
 	else
+		dx = 0;
+
+	if (range_y > 0)
 		dy = panel_height + random() % range_y;
+	else
+		dy = panel_height;
 
 	x = target_output->x + dx;
 	y = target_output->y + dy;