summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2007-01-21 17:27:23 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-01-21 17:27:23 +0000
commita236fb7a26e4bc419250e9b53143f82da389c173 (patch)
tree0fd4fdd6b2614edfc1f7886a3f3b5f49bdf0cfcb /gdk-pixbuf
parentb446db499201731591747d0f3d512bfe4aa732ae (diff)
downloadgtk+-a236fb7a26e4bc419250e9b53143f82da389c173.tar.gz
Fix error reporting in the gif loader
svn path=/trunk/; revision=17197
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/ChangeLog6
-rw-r--r--gdk-pixbuf/io-gif.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9722d53afe..8cc0e71018 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-21 Matthias Clasen <mclasen@redhat.com>
+
+ * io-gif.c (gdk_pixbuf__gif_image_stop_load): Return an
+ error if we didn't successfully load a frame. (#394190,
+ Felix Riemann)
+
2007-01-17 Michael Natterer <mitch@imendio.com>
Patch taken from maemo-gtk:
diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 5459424b14..491f9cdc80 100644
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -1526,7 +1526,7 @@ gdk_pixbuf__gif_image_stop_load (gpointer data, GError **error)
GifContext *context = (GifContext *) data;
gboolean retval = TRUE;
- if (context->state != GIF_DONE) {
+ if (context->state != GIF_DONE || context->animation->frames == NULL) {
g_set_error (error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,