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

* Fix a memory leak when encountering problems at a certain stage of compressing image data.

Browse Source
This commit is contained in:
Justin Maggard
2009-06-18 02:00:05 +00:00
parent 7e24abe127
commit cf48b38485
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
image_utils.c
View File

@@ -237,6 +237,7 @@ image_new(int32_t width, int32_t height)
if((vimage->buf = (pix *)malloc(width * height * sizeof(pix))) == NULL) if((vimage->buf = (pix *)malloc(width * height * sizeof(pix))) == NULL)
{ {
DPRINTF(E_WARN, L_METADATA, "malloc failed\n"); DPRINTF(E_WARN, L_METADATA, "malloc failed\n");
free(vimage);
return NULL; return NULL;
} }
return(vimage); return(vimage);
@@ -291,6 +292,20 @@ image_new_from_jpeg(const char * path, int is_file, const char * buf, int size)
return NULL; return NULL;
} }
if( setjmp(setjmp_buffer) )
{
jpeg_destroy_decompress(&cinfo);
if( is_file && file )
fclose(file);
if( vimage )
{
if( vimage->buf )
free(vimage->buf);
free(vimage);
}
return NULL;
}
if(cinfo.rec_outbuf_height > 16) if(cinfo.rec_outbuf_height > 16)
{ {
DPRINTF(E_WARN, L_METADATA, "ERROR image_from_jpeg : (image_from_jpeg.c) JPEG uses line buffers > 16. Cannot load.\n"); DPRINTF(E_WARN, L_METADATA, "ERROR image_from_jpeg : (image_from_jpeg.c) JPEG uses line buffers > 16. Cannot load.\n");