[16/16] xcms: Fix memory leaks on LINEAR_RGB_InitSCCData error path.

Submitted by Ander Conselvan de Oliveira on March 30, 2011, 8:12 p.m.

Details

Message ID 1301490729-22084-17-git-send-email-ander.conselvan-de-oliveira@nokia.com
State Accepted, archived
Commit 7c362e275c93c92b4e68fe862e73ee36665de703
Headers show

Not browsing as part of any series.

Commit Message

Ander Conselvan de Oliveira March 30, 2011, 8:12 p.m. 
pScreenData is replaced when building per visual intensity tables. If
malloc failed the old value of pScreenData (stored also in
pScreenDefaultData) was being leaked. Also, property_return wasn't
free'd in that case.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
---
 src/xcms/LRGB.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/src/xcms/LRGB.c b/src/xcms/LRGB.c
index 9b394fe..5ecb7d1 100644
--- a/src/xcms/LRGB.c
+++ b/src/xcms/LRGB.c
@@ -653,7 +653,7 @@  LINEAR_RGB_InitSCCData(
 	     */
 	    if (!(pScreenData = (LINEAR_RGB_SCCData *)
 			      Xcalloc (1, sizeof(LINEAR_RGB_SCCData)))) {
-		return(XcmsFailure);
+		goto Free_property_return;
 	    }
 	    /* copy matrices */
 	    memcpy((char *)pScreenData, (char *)pScreenDefaultData,
@@ -663,7 +663,7 @@  LINEAR_RGB_InitSCCData(
 	    if (!(pNewMap = (XcmsIntensityMap *)
 			      Xcalloc (1, sizeof(XcmsIntensityMap)))) {
 		Xfree((char *)pScreenData);
-		return(XcmsFailure);
+		goto Free_property_return;
 	    }
 	    pNewMap->visualID = visualID;
 	    pNewMap->screenData = (XPointer)pScreenData;
@@ -817,7 +817,7 @@  Free_property_return:
     Xfree ((char *)property_return);
 
 FreeSCCData:
-    Xfree((char *)pScreenData);
+    Xfree((char *)pScreenDefaultData);
     pPerScrnInfo->state = XcmsInitNone;
     return(XcmsFailure);
 }