[gtk+] Fixed memory leak in jasper loader



commit a15b14032eeda8d23808a842abffe3a198bd735d
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Wed Apr 8 10:50:30 2009 -0400

    Fixed memory leak in jasper loader
    
    Bug 578290. The "data" block was allocated but not used
    and not freed.
---
 gdk-pixbuf/io-jasper.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gdk-pixbuf/io-jasper.c b/gdk-pixbuf/io-jasper.c
index a841b83..e60a7c8 100644
--- a/gdk-pixbuf/io-jasper.c
+++ b/gdk-pixbuf/io-jasper.c
@@ -163,7 +163,6 @@ jasper_image_try_load (struct jasper_context *context, GError **error)
 
 	if (!context->pixbuf) {
 		int bits_per_sample;
-		guchar *data;
 
 		/* Unfortunately, gdk-pixbuf doesn't support 16 bpp images
 		 * bits_per_sample = jas_image_cmptprec (image, 0);
@@ -174,17 +173,16 @@ jasper_image_try_load (struct jasper_context *context, GError **error)
 		*/
 		bits_per_sample = 8;
 
-		data = g_try_malloc0 (context->width * context->height * bits_per_sample / 8);
-		if (data == NULL) {
+		context->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+						  FALSE, bits_per_sample,
+						  context->width, context->height);
+		if (context->pixbuf == NULL) {
 			g_set_error_literal (error,
                                              GDK_PIXBUF_ERROR,
                                              GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
                                              _("Insufficient memory to open JPEG 2000 file"));
 			return FALSE;
 		}
-		context->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-						  FALSE, bits_per_sample,
-						  context->width, context->height);
 		if (context->prepared_func)
 			context->prepared_func (context->pixbuf, NULL, context->user_data);
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]