From aef468ebbf59e6d6d59632a8cc8fc4a84a1501b1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Feb 2007 13:56:06 +0000 Subject: [PATCH] Protect against stop_load begin broken. (#403255, Lucas Mazzardo Veloso) 2007-02-06 Matthias Clasen * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Protect against stop_load begin broken. (#403255, Lucas Mazzardo Veloso) svn path=/trunk/; revision=17267 --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/gdk-pixbuf-loader.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Protect + against stop_load begin broken. (#403255, Lucas Mazzardo Veloso) + 2007-01-21 Matthias Clasen * 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; }