Ensure that tjDecompress2() exits cleanly if setDecompDefaults() fails

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@821 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/turbojpeg.c b/turbojpeg.c
index 2d5959a361150a036fdba2ceb8e581a5e78fcf0b..37ad5a37f14704d74cbba4a4abd2abfd3c7ee036 100644 (file)
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2009-2011 D. R. Commander.  All Rights Reserved.
+ * Copyright (C)2009-2012 D. R. Commander.  All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -756,7 +756,10 @@ DLLEXPORT int DLLCALL tjDecompress2(tjhandle handle, unsigned char *jpegBuf,
 
        jpeg_mem_src_tj(dinfo, jpegBuf, jpegSize);
        jpeg_read_header(dinfo, TRUE);
-       if(setDecompDefaults(dinfo, pixelFormat)==-1) return -1;
+       if(setDecompDefaults(dinfo, pixelFormat)==-1)
+       {
+               retval=-1;  goto bailout;
+       }
 
        if(flags&TJFLAG_FASTUPSAMPLE) dinfo->do_fancy_upsampling=FALSE;