From 41fdd7f88efe8b7d50c2af0cf6b9943de9dd62d0 Mon Sep 17 00:00:00 2001 From: Justin Maggard Date: Wed, 13 May 2009 08:49:02 +0000 Subject: [PATCH] * Fix scanner crash due to another type of malformed embedded JPEG data. --- image_utils.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/image_utils.c b/image_utils.c index dfab925..422847a 100644 --- a/image_utils.c +++ b/image_utils.c @@ -132,7 +132,15 @@ init_source(j_decompress_ptr cinfo) static int fill_input_buffer(j_decompress_ptr cinfo) { - return 1; + struct my_src_mgr *src = (void *)cinfo->src; + + /* Create a fake EOI marker */ + src->eoi_buffer[0] = (JOCTET) 0xFF; + src->eoi_buffer[1] = (JOCTET) JPEG_EOI; + src->pub.next_input_byte = src->eoi_buffer; + src->pub.bytes_in_buffer = 2; + + return TRUE; } static void