summaryrefslogtreecommitdiff
path: root/src/lib/ecore_x
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-02 11:15:08 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-02 13:34:45 +0900
commit5c8670fb2b956f0040b675311f13ab6a4008b040 (patch)
tree50c5744d3b9dacdf4337982f8258b07cb16068bf /src/lib/ecore_x
parentea5675a6a0a281567735164ad2bd7841f77cf17e (diff)
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).
Diffstat (limited to 'src/lib/ecore_x')
-rw-r--r--src/lib/ecore_x/ecore_x_image.c3
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 016323c..3b70308 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,
502 }; 502 };
503 int mode = 0; 503 int mode = 0;
504 504
505 EINA_SAFETY_ON_NULL_RETURN_VAL(src, EINA_FALSE);
506 EINA_SAFETY_ON_NULL_RETURN_VAL(dst, EINA_FALSE);
507
505 sbpp *= 8; 508 sbpp *= 8;
506 509
507 n = vis->map_entries; 510 n = vis->map_entries;