From: Vinson Lee <vlee@vmware.com>
Date: Tue, 17 Nov 2009 18:11:50 +0000 (-0800)
Subject: progs/util: Fix memory leak if LoadRGBImage fails.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f1172c4030dd0952dfdecda059beb39b1224a8ae;p=mesa.git

progs/util: Fix memory leak if LoadRGBImage fails.
(cherry picked from commit 041cd0e110d41b543a0fe9cc484ae8373642912b)
---

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 4e22bed81af..ec27e20d681 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -357,6 +357,7 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
       fprintf(stderr,
               "Error in LoadRGBImage %d-component images not implemented\n",
               image->components );
+      FreeImage(image);
       return NULL;
    }
 
@@ -365,8 +366,10 @@ GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
 
    bytes = image->sizeX * image->sizeY * image->components;
    buffer = (GLubyte *) malloc(bytes);
-   if (!buffer)
+   if (!buffer) {
+      FreeImage(image);
       return NULL;
+   }
 
    memcpy( (void *) buffer, (void *) image->data, bytes );