summaryrefslogtreecommitdiff
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
parent9fd0ed736dfed7739dbc35024c11ccd093b0b5f5 (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 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)
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 {