From 6697584fb9d553c2cd317ab3adffba04b5f710a3 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Wed, 11 May 2016 09:43:53 -0400 Subject: [PATCH] ecore-drm2: Fix potential invalid access to output current_mode Signed-off-by: Chris Michael --- src/lib/ecore_drm2/ecore_drm2_outputs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c b/src/lib/ecore_drm2/ecore_drm2_outputs.c index 81e0018..7596164 100644 --- a/src/lib/ecore_drm2/ecore_drm2_outputs.c +++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c @@ -90,11 +90,21 @@ _output_event_send(Ecore_Drm2_Output *output) ev->x = output->x; ev->y = output->y; - ev->w = output->current_mode->width; - ev->h = output->current_mode->height; + if (output->current_mode) + { + ev->w = output->current_mode->width; + ev->h = output->current_mode->height; + ev->refresh = output->current_mode->refresh; + } + else + { + ev->w = output->ocrtc->width; + ev->h = output->ocrtc->height; + ev->refresh = 0; + } + ev->phys_width = output->pw; ev->phys_height = output->ph; - ev->refresh = output->current_mode->refresh; ev->scale = output->scale; ev->subpixel = output->subpixel; -- 2.7.4