summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/gdk-pixbuf-loader.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-02-06 13:56:06 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-02-06 13:56:06 +0000
commit17f6d066085438409830805ba93654499f7f156b (patch)
treea6272f5224e7d1e53bce8de01cbab8c1b8aae37b /gdk-pixbuf/gdk-pixbuf-loader.c
parentd0bd1d00f8b16dc1f72acabf2b9bdc3c95082517 (diff)
downloadgdk-pixbuf-17f6d066085438409830805ba93654499f7f156b.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/gdk-pixbuf-loader.c')
-rw-r--r--gdk-pixbuf/gdk-pixbuf-loader.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index c8c985229..12f8986da 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;
}