diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-02-06 13:56:06 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-02-06 13:56:06 +0000 |
| commit | aef468ebbf59e6d6d59632a8cc8fc4a84a1501b1 (patch) | |
| tree | 6a243f4f50433493adf50d334a1068264951d4ca /gdk-pixbuf | |
| parent | af7f77d97b2e40f7b1c3396bc1365bc5fd860e8f (diff) | |
| download | gtk+-aef468ebbf59e6d6d59632a8cc8fc4a84a1501b1.tar.gz | |
Protect against stop_load begin broken. (#403255, Lucas Mazzardo Veloso)
2007-02-06 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Protect
against stop_load begin broken. (#403255, Lucas Mazzardo Veloso)
svn path=/trunk/; revision=17267
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 8cc0e71018..08dc7f77a6 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2007-02-06 Matthias Clasen <mclasen@redhat.com> + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Protect + against stop_load begin broken. (#403255, Lucas Mazzardo Veloso) + 2007-01-21 Matthias Clasen <mclasen@redhat.com> * io-gif.c (gdk_pixbuf__gif_image_stop_load): Return an diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index c8c9852292..12f8986da4 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -711,8 +711,10 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader, if (priv->image_module && priv->image_module->stop_load && priv->context) { - if (!priv->image_module->stop_load (priv->context, error)) + GError *tmp = NULL; + if (!priv->image_module->stop_load (priv->context, &tmp) || tmp) { + g_propagate_error (error, tmp); gdk_pixbuf_loader_ensure_error (loader, error); retval = FALSE; } |