blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: fix crash on VT switch 

Don't set the MODE flag when disabling a CRTC. This fixes a NULL
pointer dereference in drm_connector_state_init.
This commit is contained in:
Simon Ser 2021-09-07 11:34:53 +02:00
parent 3c74bd0c91
commit 274c8189d4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/drm/backend.c
View File

@ -110,11 +110,13 @@ static void handle_session_active(struct wl_listener *listener, void *data) {
struct wlr_drm_connector *conn; struct wlr_drm_connector *conn;
wl_list_for_each(conn, &drm->outputs, link) { wl_list_for_each(conn, &drm->outputs, link) {
struct wlr_output_mode *mode = NULL; struct wlr_output_mode *mode = NULL;
uint32_t committed = WLR_OUTPUT_STATE_ENABLED;
if (conn->output.enabled && conn->output.current_mode != NULL) { if (conn->output.enabled && conn->output.current_mode != NULL) {
committed |= WLR_OUTPUT_STATE_MODE;
mode = conn->output.current_mode; mode = conn->output.current_mode;
} }
struct wlr_output_state state = { struct wlr_output_state state = {
.committed = WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_ENABLED, .committed = committed,
.enabled = mode != NULL, .enabled = mode != NULL,
.mode_type = WLR_OUTPUT_STATE_MODE_FIXED, .mode_type = WLR_OUTPUT_STATE_MODE_FIXED,
.mode = mode, .mode = mode,