summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-10-18 13:29:44 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-10-18 13:29:44 -0400
commit7a122db34289b9cc9f5f45ffe6beae943a4ece46 (patch)
tree17cd452ddddb7fed20311383bace41454b31653e
parentebcafd424946f0b1d2504b72c939b26b4df9afff (diff)
efl/engines: fix null derefs
Summary: CIDs 1402640, 1402709 Reviewers: cedric Reviewed By: cedric Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10448
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c1
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index a71802b..33b2899 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -236,6 +236,7 @@ _ecore_evas_wayland_window_update(Ecore_Evas *ee, Ecore_Evas_Engine_Wl_Data *wda
236 int fullw, fullh; 236 int fullw, fullh;
237 237
238 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas); 238 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
239 EINA_SAFETY_ON_NULL_RETURN(einfo);
239 240
240 change = ee->shadow.changed || (new_alpha != ee->alpha); 241 change = ee->shadow.changed || (new_alpha != ee->alpha);
241 ee->alpha = new_alpha; 242 ee->alpha = new_alpha;
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index d0d111a..a5b4c7a 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -1359,6 +1359,7 @@ eng_image_native_set(void *engine, void *image, void *native)
1359 } 1359 }
1360 } 1360 }
1361 1361
1362 if (!img) return NULL;
1362 img2 = glsym_evas_gl_common_image_new_from_data(ob->gl_context, img->w, 1363 img2 = glsym_evas_gl_common_image_new_from_data(ob->gl_context, img->w,
1363 img->h, NULL, img->alpha, 1364 img->h, NULL, img->alpha,
1364 EVAS_COLORSPACE_ARGB8888); 1365 EVAS_COLORSPACE_ARGB8888);