From 661fbdfa26af5f5a392085b35a1a43294f1ea975 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 19 Sep 2008 14:34:22 +0000 Subject: [PATCH] Plug a small memory leak svn path=/trunk/; revision=21451 --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/gdk-pixbuf-io.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 619ddddedf..27f0a94f1a 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2008-09-19 Matthias Clasen + + * gdk-pixbuf-io.c: Don't call fill_info if we've already filled + the info from the module file, fixes a small memory leak. + 2008-09-18 Dominic Lachowicz * io-gdip-utils.c: Fix 2 cases where we leaked a GpImage (#552545) diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index d6ddce76a2..c24d456066 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -678,9 +678,10 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module, if (fill_vtable) { image_module->module = (void *) 1; (* fill_vtable) (image_module); - image_module->info = g_new0 (GdkPixbufFormat, 1); - (* fill_info) (image_module->info); - + if (image_module->info == NULL) { + image_module->info = g_new0 (GdkPixbufFormat, 1); + (* fill_info) (image_module->info); + } return TRUE; } else