From a56177e3cf4200e8d784658fbf2c9cb8837aef0c Mon Sep 17 00:00:00 2001 From: Pavel Charvat Date: Wed, 27 Sep 2006 13:24:47 +0200 Subject: [PATCH] and now a correct solution... skip_input_data should be able to jump exactly at EOF (according to libjpeg documentation) --- images/io-libjpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c index ccc20f36..00d1419d 100644 --- a/images/io-libjpeg.c +++ b/images/io-libjpeg.c @@ -135,12 +135,12 @@ 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); - if (!libjpeg_fastbuf_read_prepare(i)) + if (bskip(i->fastbuf, num_bytes) < num_bytes) { IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_READ_FAILED, "Incomplete JPEG file"); longjmp(i->err.setjmp_buf, 1); } + libjpeg_fastbuf_read_prepare(i); } } } -- 2.39.2