diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-02 11:15:08 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-02 13:34:45 +0900 |
| commit | 5c8670fb2b956f0040b675311f13ab6a4008b040 (patch) | |
| tree | 50c5744d3b9dacdf4337982f8258b07cb16068bf | |
| parent | ea5675a6a0a281567735164ad2bd7841f77cf17e (diff) | |
| download | efl-5c8670fb2b956f0040b675311f13ab6a4008b040.tar.gz | |
ecore_x: Avoid crash on NULL
This happens in E with software compositing, since E's commit
5702f0975e890f07cfb. E should be fixed shortly but segv is not
acceptable. Without segv E is still massively broken so it's
not like the bug would be hidden (large black areas in windows,
after switch vdesks with enough windows).
| -rw-r--r-- | src/lib/ecore_x/ecore_x_image.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/ecore_x/ecore_x_image.c b/src/lib/ecore_x/ecore_x_image.c index 016323c175..3b7030863f 100644 --- a/src/lib/ecore_x/ecore_x_image.c +++ b/src/lib/ecore_x/ecore_x_image.c @@ -502,6 +502,9 @@ ecore_x_image_to_argb_convert(void *src, }; int mode = 0; + EINA_SAFETY_ON_NULL_RETURN_VAL(src, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(dst, EINA_FALSE); + sbpp *= 8; n = vis->map_entries; |