Merge pull request #564 from agx/master

Don't crash if crtc->cursor is NULL
2018-01-15 13:41:58 +01:00 · 2018-01-15 13:41:58 +01:00 · 38887a09dc
parent e46d2dd0f8 3101c300b1
commit 38887a09dc
1 changed files with 4 additions and 0 deletions
--- a/backend/drm/atomic.c
+++ b/backend/drm/atomic.c
@ -167,6 +167,10 @@ bool legacy_crtc_move_cursor(struct wlr_drm_backend *drm,

 static bool atomic_crtc_move_cursor(struct wlr_drm_backend *drm,
 		struct wlr_drm_crtc *crtc, int x, int y) {
+	if (!crtc || !crtc->cursor) {
+		return true;
+	}
+
 	struct wlr_drm_plane *plane = crtc->cursor;
 	// We can't use atomic operations on fake planes
 	if (plane->id == 0) {