From: Jonas Ådahl <jadahl@gmail.com>
Date: Tue, 25 Dec 2012 12:01:08 +0000 (+0100)
Subject: wayland: Don't cancel a roundtrip when any event is received
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=800ed958c33092d694686fcc25c0283dfba86459;p=mesa.git

wayland: Don't cancel a roundtrip when any event is received

Since wl_display_dispatch_queue() returns the number of processed events
or -1 on error, only cancel the roundtrip if an -1 is returned.

This also fixes a potential memory corruption bug happening when the
roundtrip does an early return and the callback later writes to the then
out of scope stack allocated `done' parameter.

Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
---

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index ba54286b7bc..10a0f0830d8 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -70,6 +70,9 @@ roundtrip(struct dri2_egl_display *dri2_dpy)
    while (ret != -1 && !done)
       ret = wl_display_dispatch_queue(dri2_dpy->wl_dpy, dri2_dpy->wl_queue);
 
+   if (!done)
+      wl_callback_destroy(callback);
+
    return ret;
 }
 
diff --git a/src/gallium/state_trackers/egl/wayland/native_wayland.c b/src/gallium/state_trackers/egl/wayland/native_wayland.c
index 560e40d4cee..941a0944518 100644
--- a/src/gallium/state_trackers/egl/wayland/native_wayland.c
+++ b/src/gallium/state_trackers/egl/wayland/native_wayland.c
@@ -57,9 +57,12 @@ wayland_roundtrip(struct wayland_display *display)
    callback = wl_display_sync(display->dpy);
    wl_callback_add_listener(callback, &sync_listener, &done);
    wl_proxy_set_queue((struct wl_proxy *) callback, display->queue);
-   while (ret == 0 && !done)
+   while (ret != -1 && !done)
       ret = wl_display_dispatch_queue(display->dpy, display->queue);
 
+   if (!done)
+      wl_callback_destroy(callback);
+
    return ret;
 }