aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_image_legacy.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 11:48:01 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 11:51:56 +0900
commit69a3d686939ddb4ff0d0e7af191dc8210855e0bc (patch)
treee58ec1fbda73d1a4584f7fb4084c54320f90cca8 /src/lib/evas/canvas/evas_image_legacy.c
parentecore_drm2: Remove ecore_drm2_output_resolution_get() (diff)
downloadefl-69a3d686939ddb4ff0d0e7af191dc8210855e0bc.tar.gz
evas: Fix crash in E
Somehow starting VirtualBox would crash E when trying to upload invalid data. I believe checking for NULL data here is all we need to do in order to keep the image data consistent and valid. I have to admit I'm not 100% sure what is happening here. Fixes https://phab.enlightenment.org/T5868 @fix
Diffstat (limited to 'src/lib/evas/canvas/evas_image_legacy.c')
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 3f69dca4e6..dd6e579537 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -694,7 +694,7 @@ evas_object_image_data_get(const Eo *eo_obj, Eina_Bool for_writing)
pixels = ENFN->image_data_get(ENDT, o->engine_data, for_writing, &data, &o->load_error, &tofree);
/* if we fail to get engine_data, we have to return NULL */
- if (!pixels) return NULL;
+ if (!pixels || !data) goto error;
if (!tofree)
{