jpeg pushed a commit to branch master.

commit 69a3d686939ddb4ff0d0e7af191dc8210855e0bc
Author: Jean-Philippe Andre <>
Date:   Thu Aug 10 11:48:01 2017 +0900

    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
 src/lib/evas/canvas/evas_image_legacy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/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 
    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)


Reply via email to