usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

evas/cserve2: Prevent potential infinite loop (shutdown) 

In shutdown, I've encountered an infinite loop.
It SHOULD NOT possibly happen, but somehow some image
was marked as delete_me=1 but still present in the LRU.
This commit is contained in:
Jean-Philippe Andre 2013-10-30 14:57:52 +09:00
parent 2b8e74e623
commit 498418bb67
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/evas/cache2/evas_cache2.c
View File

@ -523,26 +523,19 @@ evas_cache2_shutdown(Evas_Cache2 *cache)
{
Eina_List *delete_list;
Image_Entry *im;
Eina_Inlist *il;
EINA_INLIST_FOREACH_SAFE(cache->lru, il, im)
_evas_cache2_image_entry_delete(cache, im);
while (cache->lru)
{
im = (Image_Entry *)cache->lru;
_evas_cache2_image_entry_delete(cache, im);
}
/* This is mad, I am about to destroy image still alive, but we need to prevent leak. */
while (cache->dirty)
{
im = (Image_Entry *)cache->dirty;
_evas_cache2_image_entry_delete(cache, im);
}
EINA_INLIST_FOREACH_SAFE(cache->dirty, il, im)
_evas_cache2_image_entry_delete(cache, im);
delete_list = NULL;
eina_hash_foreach(cache->activ, _evas_cache2_image_free_cb, &delete_list);
while (delete_list)
{
_evas_cache2_image_entry_delete(cache, eina_list_data_get(delete_list));
delete_list = eina_list_remove_list(delete_list, delete_list);
}
EINA_LIST_FREE(delete_list, im)
_evas_cache2_image_entry_delete(cache, im);
eina_hash_free(cache->activ);
eina_hash_free(cache->inactiv);