summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 11:48:01 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-08-10 13:42:41 +0900
commit4b5e2b47823731966b0f22094c406377912e520e (patch)
treedffd0fda6d9f97008a6eefd9c13b834a8f55126a
parentb99dbdb728cf441d718a994afa97b21763f1c212 (diff)
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 T5868 @fix
-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 3f69dca..dd6e579 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)
694 pixels = ENFN->image_data_get(ENDT, o->engine_data, for_writing, &data, &o->load_error, &tofree); 694 pixels = ENFN->image_data_get(ENDT, o->engine_data, for_writing, &data, &o->load_error, &tofree);
695 695
696 /* if we fail to get engine_data, we have to return NULL */ 696 /* if we fail to get engine_data, we have to return NULL */
697 if (!pixels) return NULL; 697 if (!pixels || !data) goto error;
698 698
699 if (!tofree) 699 if (!tofree)
700 { 700 {