From 9e4e6c85ff7a2b781d0a9706f16e9b481c4e812b Mon Sep 17 00:00:00 2001 From: Sean Fox Date: Sat, 17 Jan 2009 23:46:27 +0000 Subject: Disallow a 0 value in the 'bits per pixel' field of a Windows 2.x header. Kudos to Joonas Pihlaja. svn path=/trunk/libnsbmp/; revision=6122 --- libnsbmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libnsbmp.c b/libnsbmp.c index 4d38207..2b08c6d 100644 --- a/libnsbmp.c +++ b/libnsbmp.c @@ -367,6 +367,8 @@ static bmp_result bmp_analyse_header(bmp_image *bmp, uint8_t *data) { if (read_uint16(data, 8) != 1) return BMP_DATA_ERROR; bmp->bpp = read_uint16(data, 10); + if (bmp->bpp == 0) + return BMP_DATA_ERROR; bmp->colours = (1 << bmp->bpp); palette_size = 3; } else if (header_size < 40) { -- cgit v1.2.3