diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2019-10-18 13:29:44 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-10-18 13:29:44 -0400 |
commit | 7a122db34289b9cc9f5f45ffe6beae943a4ece46 (patch) | |
tree | 17cd452ddddb7fed20311383bace41454b31653e | |
parent | ebcafd424946f0b1d2504b72c939b26b4df9afff (diff) | |
download | efl-7a122db34289b9cc9f5f45ffe6beae943a4ece46.tar.gz |
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.c | 1 | ||||
-rw-r--r-- | src/modules/evas/engines/gl_drm/evas_engine.c | 1 |
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 a71802b78b..33b2899e61 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 int fullw, fullh; einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas); + EINA_SAFETY_ON_NULL_RETURN(einfo); change = ee->shadow.changed || (new_alpha != ee->alpha); 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 d0d111ae35..a5b4c7a4c8 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) } } + if (!img) return NULL; img2 = glsym_evas_gl_common_image_new_from_data(ob->gl_context, img->w, img->h, NULL, img->alpha, EVAS_COLORSPACE_ARGB8888); |