From a66dd6b37d816144dd89de0e28ebb72e298d5c5d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 23 Jan 2005 04:35:09 +0000 Subject: [PATCH] Close the loader before unreffing it in the error case. (#164915, Crispin 2005-01-22 Matthias Clasen * gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_type) (gdk_pixbuf_loader_new_with_mime_type): Close the loader before unreffing it in the error case. (#164915, Crispin Flowerday) --- gdk-pixbuf/ChangeLog | 7 +++++++ gdk-pixbuf/gdk-pixbuf-loader.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index db00ecc44b..aba9898545 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2005-01-22 Matthias Clasen + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_type) + (gdk_pixbuf_loader_new_with_mime_type): Close the loader + before unreffing it in the error case. (#164915, Crispin + Flowerday) + 2005-01-12 Owen Taylor * Makefile.am: Use grep | head -n 1 instead of grep -m 1 diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index 9e252c5706..bccee9fc77 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -564,6 +564,7 @@ gdk_pixbuf_loader_new_with_type (const char *image_type, if (tmp != NULL) { g_propagate_error (error, tmp); + gdk_pixbuf_loader_close (retval, NULL); g_object_unref (retval); return NULL; } @@ -619,10 +620,11 @@ gdk_pixbuf_loader_new_with_mime_type (const char *mime_type, retval = g_object_new (GDK_TYPE_PIXBUF_LOADER, NULL); tmp = NULL; - gdk_pixbuf_loader_load_module(retval, image_type, &tmp); + gdk_pixbuf_loader_load_module (retval, image_type, &tmp); if (tmp != NULL) { g_propagate_error (error, tmp); + gdk_pixbuf_loader_close (retval, NULL); g_object_unref (retval); return NULL; } -- GitLab