[EGIT] [core/enlightenment] enlightenment-0.20 124/140: set NULL image pixel data during x11 render when no damages exist

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=72374fee7f0b89f0b76b86454c615da52a805d84

commit 72374fee7f0b89f0b76b86454c615da52a805d84
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Apr 21 18:21:26 2016 -0400

    set NULL image pixel data during x11 render when no damages exist
    
    fixes a weird corner case where shapeless clients try to sneak a fast one
    by and you gotta be like http://i.imgur.com/irwmnCT.webm
    
    ref T3157
---
 src/bin/e_comp_object.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 99b0762..5934a2a 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3752,6 +3752,7 @@ e_comp_object_render(Evas_Object *obj)
                }
              RENDER_DEBUG("UPDATE [%p] %i %i %ix%i", cw->ec, r->x, r->y, r->w, 
r->h);
           }
+        if (!it) pix = NULL;
         goto end;
      }
 
@@ -3778,6 +3779,7 @@ e_comp_object_render(Evas_Object *obj)
         e_pixmap_image_data_argb_convert(cw->ec->pixmap, pix, srcpix, r, 
stride);
         RENDER_DEBUG("UPDATE [%p]: %d %d %dx%d -- pix = %p", cw->ec, r->x, 
r->y, r->w, r->h, pix);
      }
+   if (!it) pix = NULL;
    eina_iterator_free(it);
 end:
    evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);

--