forked from enlightenment/efl
evas: use Eina_File for wbmp code and fix a potential race condition at the same time.
SVN revision: 66187
This commit is contained in:
parent
39d04ed728
commit
f86908dc15
|
@ -558,4 +558,5 @@
|
||||||
|
|
||||||
2011-12-14 Cedric BAIL
|
2011-12-14 Cedric BAIL
|
||||||
|
|
||||||
* Use Eina_File when loading bmp, ico and pmaps files.
|
* Use Eina_File when loading bmp, ico, pmaps and wbmp files.
|
||||||
|
* Fix potential race condition in wbmp loader code.
|
||||||
|
|
|
@ -9,7 +9,7 @@ Additions:
|
||||||
|
|
||||||
Improvements:
|
Improvements:
|
||||||
|
|
||||||
* Use Eina_File mmap infrastructure for bmp, ico and pmaps file access.
|
* Use Eina_File mmap infrastructure for bmp, ico, pmaps and wbmp file access.
|
||||||
|
|
||||||
Evas 1.1.0
|
Evas 1.1.0
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ static Evas_Image_Load_Func evas_image_load_wbmp_func =
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
read_mb(unsigned int *data, FILE *f)
|
read_mb(unsigned int *data, void *map, size_t length, size_t *position)
|
||||||
{
|
{
|
||||||
int ac = 0, ct;
|
int ac = 0, ct;
|
||||||
unsigned char buf;
|
unsigned char buf;
|
||||||
|
@ -33,8 +33,8 @@ read_mb(unsigned int *data, FILE *f)
|
||||||
for (ct = 0;;)
|
for (ct = 0;;)
|
||||||
{
|
{
|
||||||
if ((ct++) == 5) return -1;
|
if ((ct++) == 5) return -1;
|
||||||
if ((fread(&buf, 1, 1, f)) < 1)
|
if (*position > length) return -1;
|
||||||
return -1;
|
buf = ((unsigned char *) map)[(*position)++];
|
||||||
ac = (ac << 7) | (buf & 0x7f);
|
ac = (ac << 7) | (buf & 0x7f);
|
||||||
if ((buf & 0x80) == 0) break;
|
if ((buf & 0x80) == 0) break;
|
||||||
}
|
}
|
||||||
|
@ -45,21 +45,27 @@ read_mb(unsigned int *data, FILE *f)
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
evas_image_load_file_head_wbmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error)
|
evas_image_load_file_head_wbmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error)
|
||||||
{
|
{
|
||||||
FILE *f;
|
Eina_File *f;
|
||||||
|
void *map = NULL;
|
||||||
|
size_t position = 0;
|
||||||
|
size_t length;
|
||||||
unsigned int type, w, h;
|
unsigned int type, w, h;
|
||||||
unsigned char fixed_header;
|
|
||||||
struct stat statbuf;
|
|
||||||
|
|
||||||
*error = EVAS_LOAD_ERROR_GENERIC;
|
*error = EVAS_LOAD_ERROR_GENERIC;
|
||||||
f = fopen(file, "rb");
|
f = eina_file_open(file, 0);
|
||||||
if (!f)
|
if (!f)
|
||||||
{
|
{
|
||||||
*error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
|
*error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stat(file, &statbuf) == -1) goto bail;
|
length = eina_file_size_get(f);
|
||||||
if (read_mb(&type, f) < 0) goto bail;
|
if (length <= 4) goto bail;
|
||||||
|
|
||||||
|
map = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
|
||||||
|
if (!map) goto bail;
|
||||||
|
|
||||||
|
if (read_mb(&type, map, length, &position) < 0) goto bail;
|
||||||
|
|
||||||
if (type != 0)
|
if (type != 0)
|
||||||
{
|
{
|
||||||
|
@ -67,9 +73,9 @@ evas_image_load_file_head_wbmp(Image_Entry *ie, const char *file, const char *ke
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fread(&fixed_header, 1, 1, f) != 1) goto bail;
|
position++; /* skipping one byte */
|
||||||
if (read_mb(&w, f) < 0) goto bail;
|
if (read_mb(&w, map, length, &position) < 0) goto bail;
|
||||||
if (read_mb(&h, f) < 0) goto bail;
|
if (read_mb(&h, map, length, &position) < 0) goto bail;
|
||||||
if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
|
if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
|
||||||
IMG_TOO_BIG(w, h))
|
IMG_TOO_BIG(w, h))
|
||||||
{
|
{
|
||||||
|
@ -77,37 +83,66 @@ evas_image_load_file_head_wbmp(Image_Entry *ie, const char *file, const char *ke
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(f);
|
eina_file_map_free(f, map);
|
||||||
|
eina_file_close(f);
|
||||||
ie->w = w;
|
ie->w = w;
|
||||||
ie->h = h;
|
ie->h = h;
|
||||||
|
|
||||||
*error = EVAS_LOAD_ERROR_NONE;
|
*error = EVAS_LOAD_ERROR_NONE;
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
bail:
|
bail:
|
||||||
fclose(f);
|
if (map) eina_file_map_free(f, map);
|
||||||
|
eina_file_close(f);
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
evas_image_load_file_data_wbmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error)
|
evas_image_load_file_data_wbmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error)
|
||||||
{
|
{
|
||||||
FILE *f;
|
Eina_File *f;
|
||||||
unsigned int dummy, line_length;
|
void *map = NULL;
|
||||||
|
size_t position = 0;
|
||||||
|
size_t length;
|
||||||
|
unsigned int type, w, h;
|
||||||
|
unsigned int line_length;
|
||||||
unsigned char *line = NULL;
|
unsigned char *line = NULL;
|
||||||
int cur = 0, x, y;
|
int cur = 0, x, y;
|
||||||
DATA32 *dst_data;
|
DATA32 *dst_data;
|
||||||
|
|
||||||
*error = EVAS_LOAD_ERROR_GENERIC;
|
*error = EVAS_LOAD_ERROR_GENERIC;
|
||||||
f = fopen(file, "rb");
|
f = eina_file_open(file, EINA_FALSE);
|
||||||
if (!f)
|
if (!f)
|
||||||
{
|
{
|
||||||
*error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
|
*error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
if (read_mb(&dummy, f) < 0) goto bail;
|
|
||||||
if (fread(&dummy, 1, 1, f) != 1) goto bail;
|
length = eina_file_size_get(f);
|
||||||
if (read_mb(&dummy, f) < 0) goto bail;
|
if (length <= 4) goto bail;
|
||||||
if (read_mb(&dummy, f) < 0) goto bail;
|
|
||||||
|
map = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
|
||||||
|
if (!map) goto bail;
|
||||||
|
|
||||||
|
if (read_mb(&type, map, length, &position) < 0) goto bail;
|
||||||
|
position++; /* skipping one byte */
|
||||||
|
if (read_mb(&w, map, length, &position) < 0) goto bail;
|
||||||
|
if (read_mb(&h, map, length, &position) < 0) goto bail;
|
||||||
|
|
||||||
|
if (type != 0)
|
||||||
|
{
|
||||||
|
*error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
|
||||||
|
IMG_TOO_BIG(w, h))
|
||||||
|
{
|
||||||
|
*error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
|
||||||
|
ie->w = w;
|
||||||
|
ie->h = h;
|
||||||
|
|
||||||
evas_cache_image_surface_alloc(ie, ie->w, ie->h);
|
evas_cache_image_surface_alloc(ie, ie->w, ie->h);
|
||||||
dst_data = evas_cache_image_pixels(ie);
|
dst_data = evas_cache_image_pixels(ie);
|
||||||
|
@ -118,11 +153,12 @@ evas_image_load_file_data_wbmp(Image_Entry *ie, const char *file, const char *ke
|
||||||
}
|
}
|
||||||
|
|
||||||
line_length = (ie->w + 7) >> 3;
|
line_length = (ie->w + 7) >> 3;
|
||||||
line = alloca(line_length);
|
|
||||||
|
|
||||||
for (y = 0; y < (int)ie->h; y++)
|
for (y = 0; y < (int)ie->h; y++)
|
||||||
{
|
{
|
||||||
if (fread(line, 1, line_length, f) != line_length) goto bail;
|
if (position + line_length > length) goto bail;
|
||||||
|
line = ((unsigned char*) map) + position;
|
||||||
|
position += line_length;
|
||||||
for (x = 0; x < (int)ie->w; x++)
|
for (x = 0; x < (int)ie->w; x++)
|
||||||
{
|
{
|
||||||
int idx = x >> 3;
|
int idx = x >> 3;
|
||||||
|
@ -132,11 +168,13 @@ evas_image_load_file_data_wbmp(Image_Entry *ie, const char *file, const char *ke
|
||||||
cur++;
|
cur++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fclose(f);
|
eina_file_map_free(f, map);
|
||||||
|
eina_file_close(f);
|
||||||
*error = EVAS_LOAD_ERROR_NONE;
|
*error = EVAS_LOAD_ERROR_NONE;
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
bail:
|
bail:
|
||||||
fclose(f);
|
if (map) eina_file_map_free(f, map);
|
||||||
|
eina_file_close(f);
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue