From: Rob Bradford <rob@linux.intel.com>
Date: Wed, 5 Dec 2012 18:47:05 +0000 (+0000)
Subject: compositor: Avoid sending event for invalid point
X-Git-Tag: accepted/2.0alpha-wayland/20130215.220742~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f14a241f3554963e8bef82beae275301720ac47e;p=profile%2Fivi%2Fweston.git

compositor: Avoid sending event for invalid point

Avoid sending a touch down event using uninitialised surface x/y co-ordinates.
Instead present a log message about this unexpected case.
---

diff --git a/src/compositor.c b/src/compositor.c
index 17a9203..69dfd41 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1943,6 +1943,13 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id,
 		} else if (touch->focus) {
 			es = (struct weston_surface *) touch->focus;
 			weston_surface_from_global_fixed(es, x, y, &sx, &sy);
+		} else {
+			/* Unexpected condition: We have non-initial touch but
+			 * there is no focused surface.
+			 */
+			weston_log("touch event received with %d points down"
+				   "but no surface focused\n", seat->num_tp);
+			return;
 		}
 
 		grab->interface->down(grab, time, touch_id, sx, sy);