From 6cf9246ad63b77f0dcc3bec92862529debf48fed Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 21 Oct 2014 08:18:34 -0400 Subject: ecore-drm: Default output to NULL and add safety check for NULL output after the device loop. Summary: If there are no outputs created during the loop, we would end up crashing here by checking output->watch. This fixes that situation without leaking resources because we still end up doing our cleanup. NB: Thanks Cedric for the report !! :) @fix Signed-off-by: Chris Michael --- src/lib/ecore_drm/ecore_drm_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_drm/ecore_drm_output.c b/src/lib/ecore_drm/ecore_drm_output.c index 69babf53e4..396e888aaf 100644 --- a/src/lib/ecore_drm/ecore_drm_output.c +++ b/src/lib/ecore_drm/ecore_drm_output.c @@ -647,7 +647,7 @@ EAPI Eina_Bool ecore_drm_outputs_create(Ecore_Drm_Device *dev) { Eina_Bool ret = EINA_TRUE; - Ecore_Drm_Output *output; + Ecore_Drm_Output *output = NULL; drmModeConnector *conn; drmModeRes *res; drmModeCrtc *crtc; @@ -737,7 +737,7 @@ ecore_drm_outputs_create(Ecore_Drm_Device *dev) /* free resources */ drmModeFreeResources(res); - if (!output->watch) + if ((output) && (!output->watch)) { int events = 0; -- cgit v1.2.1