From 0036a3e4daefb306074a4822969263d6151cd17f Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 4 Oct 2004 20:43:21 +0000 Subject: [PATCH] MFH: Fixed bug #30281 (Prevent non-wbmp images from being detected as such) --- NEWS | 6 ++++-- ext/standard/image.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 4be8ecd187..54a24cdde8 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, PHP 5.0.3 -- Fixed bug #30282 (segfault when using unknown/unsupported session.save_handler - and/or session.serialize_handler). (Tony) +- Fixed bug #30282 (segfault when using unknown/unsupported + session.save_handler and/or session.serialize_handler). (Tony) +- Fixed bug #30281 (Prevent non-wbmp images from being detected as such). + (Ilia) - Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia) - Fixed bug #30224 (Sybase date strings are sometimes not null terminated). (Ilia) diff --git a/ext/standard/image.c b/ext/standard/image.c index 8b85ab7192..4df21442ba 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -957,7 +957,7 @@ static int php_get_wbmp(php_stream *stream, struct gfxinfo **result, int check T } while (i & 0x80); /* maximum valid sizes for wbmp (although 127x127 may be a more accurate one) */ - if (height > 2048 || width > 2048) { + if (!height || !width || height > 2048 || width > 2048) { return 0; } -- 2.50.1