cedric pushed a commit to branch master.
commit 6f548d59af790fd202c32b8139204d7cc3014454
Author: Jean-Philippe Andre <[email protected]>
Date: Wed Jun 5 16:11:13 2013 +0900
evas/cserve2: Fix crash in expedite test 23
Test 23: load lots of scaled images and draw them
Problem: cs2 fails to load more images at some point. (root cause to be
fixed!)
After that, client expects some data, but there is none, so it segfaults.
---
src/modules/evas/engines/software_generic/evas_engine.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 3df9b3c..ef766dd 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -1358,6 +1358,7 @@ image_loaded:
if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888)
evas_cache2_image_load_data(&im->cache_entry);
+ if (!im->cache_entry.flags.loaded) return EINA_FALSE;
evas_common_image_colorspace_normalize(im);
if (smooth)
@@ -1384,7 +1385,7 @@ image_loaded:
dst_x, dst_y, dst_w, dst_h);
}
- evas_common_cpu_end_opt();
+ evas_common_cpu_end_opt();
}
return EINA_FALSE;
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
