enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

evas scale cache - address possible coverity deadlock 

this should fix CID 1106338  where we don't lock and unlock caches in
the same order.
This commit is contained in:
Carsten Haitzler 2016-07-11 21:45:39 +09:00
parent ea99e6288d
commit 98a02fc17c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/evas/common/evas_image_scalecache.c
View File

@ -802,7 +802,10 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
ct = evas_common_draw_context_new();
evas_common_draw_context_set_render_op(ct, _EVAS_RENDER_COPY);
}
SLKU(cache_lock);
SLKU(im->cache.lock);
SLKL(cache_lock);
if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888)
{
#ifdef EVAS_CSERVE2
@ -812,7 +815,10 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie, RGBA_Image *dst,
#endif
evas_cache_image_load_data(&im->cache_entry);
}
SLKU(cache_lock);
SLKL(im->cache.lock);
SLKL(cache_lock);
evas_common_image_colorspace_normalize(im);
if (im->image.data)
{