From 266a1a44d2f6e73878fb742e088ea722873a182e Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 26 Mar 2013 12:28:06 +0100 Subject: cbz: Prevent segfault when testing for file type magic on empty files. --- cbz/mucbz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cbz') diff --git a/cbz/mucbz.c b/cbz/mucbz.c index b06851fe..874e1455 100644 --- a/cbz/mucbz.c +++ b/cbz/mucbz.c @@ -396,9 +396,9 @@ cbz_load_page(cbz_document *doc, int number) data = cbz_read_zip_entry(doc, doc->entry[number].offset, &size); - if (data[0] == 0xff && data[1] == 0xd8) + if (size > 2 && data[0] == 0xff && data[1] == 0xd8) pixmap = fz_load_jpeg(ctx, data, size); - else if (memcmp(data, "\211PNG\r\n\032\n", 8) == 0) + else if (size > 8 && memcmp(data, "\211PNG\r\n\032\n", 8) == 0) pixmap = fz_load_png(ctx, data, size); else fz_throw(ctx, "unknown image format"); -- cgit v1.2.3