orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix image double-deref/free when not meant to happen 

SVN revision: 58682
This commit is contained in:
Carsten Haitzler 2011-04-15 07:49:25 +00:00
parent 7722171b96
commit 4e5231b3f8
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/evas/src/lib/cache/evas_cache_image.c vendored
View File

@ -876,16 +876,15 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
if (im)
{
int ok = 1;
stat_done = 1;
if (stat(file, &st) < 0) goto on_stat_error;
{
if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
}
if (stat(file, &st) < 0) ok = 0;
else if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
if (ok) goto on_ok;
_evas_cache_image_remove_activ(cache, im);
_evas_cache_image_make_dirty(cache, im);
im = NULL;
}
#ifdef EVAS_FRAME_QUEUING
@ -902,11 +901,10 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
if (!stat_done)
{
stat_done = 1;
if (stat(file, &st) < 0) goto on_stat_error;
if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
if (stat(file, &st) < 0) ok = 0;
else if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
}
else
if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
else if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
if (ok)
{
@ -914,8 +912,8 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
_evas_cache_image_make_activ(cache, im, im->cache_key);
goto on_ok;
}
_evas_cache_image_entry_delete(cache, im);
_evas_cache_image_make_dirty(cache, im);
im = NULL;
}
if (!stat_done)