From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Wed, 27 Sep 2006 11:06:17 +0000 (+0200)
Subject: fixed segfault when libjpeg asked to skip behind EOF
X-Git-Tag: holmes-import~522
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=5e40d46d620c4ed228e9205a644b8e01c7e92e63;p=libucw.git

fixed segfault when libjpeg asked to skip behind EOF
---

diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c
index 30bd0fff..ccc20f36 100644
--- a/images/io-libjpeg.c
+++ b/images/io-libjpeg.c
@@ -136,7 +136,11 @@ libjpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
 	  num_bytes -= i->src.bytes_in_buffer;
 	  libjpeg_fastbuf_read_commit(i);
 	  bskip(i->fastbuf, num_bytes);
-	  libjpeg_fastbuf_read_prepare(i);
+	  if (!libjpeg_fastbuf_read_prepare(i))
+	    {
+	      IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_READ_FAILED, "Incomplete JPEG file");
+	      longjmp(i->err.setjmp_buf, 1);
+	    }
 	}
     }
 }