Fix error reporting in the gif loader

svn path=/trunk/; revision=17197

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9722d53afef7236f6d8f0c96aa8bd49938a8490b..8cc0e7101898818e3f588caac7b58551ca686a88 100644 (file)
--- 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 5459424b14d468894083e97427b8f6a528769d5e..491f9cdc80a5dce3d9182d01a2fd8c450a1deb80 100644 (file)
--- 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,