hw/xwayland/xwayland-present.c

@@ -414,9 +414,11 @@ xwl_present_cleanup(WindowPtr window)
         xwl_present_window->sync_callback = NULL;
     }
 
-    /* Clear remaining events */
-    xorg_list_for_each_entry_safe(event, tmp, &window_priv->vblank, vblank.window_list)
-        xwl_present_free_event(event);
+    if (window_priv) {
+        /* Clear remaining events */
+        xorg_list_for_each_entry_safe(event, tmp, &window_priv->vblank, vblank.window_list)
+            xwl_present_free_event(event);
+    }
 
     /* Clear timer */
     xwl_present_free_timer(xwl_present_window);

test/scripts/xwayland-piglit.sh

@@ -18,7 +18,7 @@ WESTON_PID=$!
 export WAYLAND_DISPLAY=wayland-$$
 
 # Wait for weston to initialize before starting Xwayland
-timeout --preserve-status 60s bash -c "while ! $XSERVER_BUILDDIR/hw/xwayland/Xwayland -pogo &>/dev/null; do sleep 1; done"
+timeout --preserve-status 60s bash -c "while ! $XSERVER_BUILDDIR/hw/xwayland/Xwayland -pogo -displayfd 1 &>/dev/null; do sleep 1; done"
 
 # Start an Xwayland server
 export PIGLIT_RESULTS_DIR=$XSERVER_BUILDDIR/test/piglit-results/xwayland