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

* evas: fix race condition when file change between header read and data read. 

WARNING: THIS RACE STILL EXIST IF YOU USE JPEG REGION.


SVN revision: 48200
This commit is contained in:
Cedric BAIL 2010-04-21 13:47:42 +00:00
parent 661e7e8be2
commit 7c0098c1a3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
View File

@ -290,14 +290,15 @@ evas_image_load_file_data_jpeg_internal(Image_Entry *ie, FILE *f, int *error)
cinfo.region_h = ie->load_opts.region.h;
#endif
}
if ((w != ie->w) || (h != ie->h))
if ((!region) && ((w != ie->w) || (h != ie->h)))
{
// OK. region decode happening. a sub-set of the image
// jpeg_destroy_decompress(&cinfo);
// *error = EVAS_LOAD_ERROR_GENERIC;
// return EINA_FALSE;
// race condition, the file could have change from when we call header
// this test will not solve the problem with region code.
jpeg_destroy_decompress(&cinfo);
*error = EVAS_LOAD_ERROR_GENERIC;
return EINA_FALSE;
}
if ((region) &&
if ((region) &&
((ie->w != ie->load_opts.region.w) || (ie->h != ie->load_opts.region.h)))
{
ie->w = ie->load_opts.region.w;