[gdk-pixbuf/gdk-pixbuf-2-32] bmp: Reject bogus depth
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf/gdk-pixbuf-2-32] bmp: Reject bogus depth
- Date: Mon, 14 Dec 2015 12:16:38 +0000 (UTC)
commit 075bc1b08a64a064edc4890454a108680f23f798
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Dec 5 15:49:32 2015 -0500
bmp: Reject bogus depth
Erroring out early if we find a bogus image depth is
the right thing to do, and avoids possible memory
overruns later on.
https://bugzilla.gnome.org/show_bug.cgi?id=747605
gdk-pixbuf/io-bmp.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index 1f197e8..5c30bfb 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -318,6 +318,15 @@ static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
return FALSE;
}
+ if (State->Header.depth > 32)
+ {
+ g_set_error_literal (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+ _("BMP image has unsupported depth"));
+ State->read_state = READ_STATE_ERROR;
+ }
+
if (State->Header.size == 12)
clrUsed = 1 << State->Header.depth;
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]