ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that libjpeg state is reset if an error occurs

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@437 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-02-24 21:16:10 +00:00
parent 6e51e19b1c
commit 582a46a59e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
turbojpegl.c
View File

@@ -294,6 +294,7 @@ DLLEXPORT int DLLCALL tjCompress(tjhandle h,
-(unsigned long)(j->jdms.free_in_buffer); -(unsigned long)(j->jdms.free_in_buffer);
bailout: bailout:
if(j->cinfo.global_state>CSTATE_START) jpeg_abort_compress(&j->cinfo);
if(row_pointer) free(row_pointer); if(row_pointer) free(row_pointer);
for(i=0; i<MAX_COMPONENTS; i++) for(i=0; i<MAX_COMPONENTS; i++)
{ {
@@ -576,6 +577,7 @@ DLLEXPORT int DLLCALL tjDecompress(tjhandle h,
jpeg_finish_decompress(&j->dinfo); jpeg_finish_decompress(&j->dinfo);
bailout: bailout:
if(j->dinfo.global_state>DSTATE_START) jpeg_abort_decompress(&j->dinfo);
for(i=0; i<MAX_COMPONENTS; i++) for(i=0; i<MAX_COMPONENTS; i++)
{ {
if(tmpbuf[i]) free(tmpbuf[i]); if(tmpbuf[i]) free(tmpbuf[i]);