Merge pull request #564 from agx/master

Don't crash if crtc->cursor is NULL
This commit is contained in:
emersion 2018-01-15 13:41:58 +01:00 committed by GitHub
commit 38887a09dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

View File

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