aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-06-05 16:11:13 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-06-14 16:38:18 +0900
commit6f548d59af790fd202c32b8139204d7cc3014454 (patch)
treee33f75741ba141a1a1657d763b50753f0a1ed64b
parentevas: preliminary work on texture destruction for async preload of texture. (diff)
downloadefl-6f548d59af790fd202c32b8139204d7cc3014454.tar.gz
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.
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 3df9b3cc70..ef766dd479 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;