summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-06-12 05:40:13 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-06-12 05:40:13 +0000
commitd6061b54e29db4a230d2ddaf827b52ede25e1d23 (patch)
tree087db99b3ee5432ac0d449471bdebf0d66d78d81 /gdk-pixbuf
parent1adaeba11fc1c5017e365bca048df6eb24e3e6a3 (diff)
downloadgdk-pixbuf-d6061b54e29db4a230d2ddaf827b52ede25e1d23.tar.gz
Fix out-of-bound access. (#440918, Matthias Kilian)
2007-06-12 Behdad Esfahbod <behdad@gnome.org> * io-pnm.c (explode_bitmap_into_buf): Fix out-of-bound access. (#440918, Matthias Kilian) svn path=/trunk/; revision=18110
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/ChangeLog5
-rw-r--r--gdk-pixbuf/io-pnm.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 6bb659fc8..730a53379 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-12 Behdad Esfahbod <behdad@gnome.org>
+
+ * io-pnm.c (explode_bitmap_into_buf): Fix out-of-bound access.
+ (#440918, Matthias Kilian)
+
2007-06-06 Matthias Clasen <mclasen@redhat.com>
* === Released 2.11.2 ===
diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index f9391ca0b..37f726b30 100644
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -133,7 +133,7 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
to -= 3;
bit++;
- if (bit > 7) {
+ if (bit > 7 && x > 0) {
from--;
data = from[0];
bit = 0;