storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix potential infinite loop with some bad JPEGs.

Browse Source
This commit is contained in:
Justin Maggard 2010-07-21 20:19:39 +00:00
parent 431d354700
commit 3ce1f12d04
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
image_utils.c
View File

@ -237,11 +237,17 @@ image_get_jpeg_resolution(const char * path, int * width, int * height)
unsigned char buf[8]; unsigned char buf[8];
u_int16_t offset, h, w; u_int16_t offset, h, w;
int ret = 1; int ret = 1;
long size;
img = fopen(path, "r"); img = fopen(path, "r");
if( !img ) if( !img )
return(-1); return(-1);
fseek(img, 0, SEEK_END);
size = ftell(img);
rewind(img);
fread(&buf, 2, 1, img); fread(&buf, 2, 1, img);
if( (buf[0] != 0xFF) || (buf[1] != 0xD8) ) if( (buf[0] != 0xFF) || (buf[1] != 0xD8) )
{ {
@ -250,7 +256,7 @@ image_get_jpeg_resolution(const char * path, int * width, int * height)
} }
memset(&buf, 0, sizeof(buf)); memset(&buf, 0, sizeof(buf));
while( !feof(img) ) while( ftell(img) < size )
{ {
while( buf[0] != 0xFF && !feof(img) ) while( buf[0] != 0xFF && !feof(img) )
fread(&buf, 1, 1, img); fread(&buf, 1, 1, img);
@ -276,7 +282,8 @@ image_get_jpeg_resolution(const char * path, int * width, int * height)
fread(&buf, 2, 1, img); fread(&buf, 2, 1, img);
memcpy(&offset, buf, 2); memcpy(&offset, buf, 2);
offset = SWAP16(offset) - 2; offset = SWAP16(offset) - 2;
fseek(img, offset, SEEK_CUR); if( fseek(img, offset, SEEK_CUR) == -1 )
break;
} }
} }
fclose(img); fclose(img);