aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/xcms/LRGB.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-15 14:48:46 +0000
committermarha <marha@users.sourceforge.net>2011-04-15 14:48:46 +0000
commit71372d36e1a3f0230b88808f70d35446fda12260 (patch)
tree205982f029074be1167820e69891d8332e0a8df2 /libX11/src/xcms/LRGB.c
parent019fc27ce6dc2a1809107be10d4deb80e0fa436b (diff)
downloadvcxsrv-71372d36e1a3f0230b88808f70d35446fda12260.tar.gz
vcxsrv-71372d36e1a3f0230b88808f70d35446fda12260.tar.bz2
vcxsrv-71372d36e1a3f0230b88808f70d35446fda12260.zip
xserver xkeyboard-config libX11 mesa git update 15 April 2011
Diffstat (limited to 'libX11/src/xcms/LRGB.c')
-rw-r--r--libX11/src/xcms/LRGB.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libX11/src/xcms/LRGB.c b/libX11/src/xcms/LRGB.c
index 2dca82ee8..5ecb7d120 100644
--- a/libX11/src/xcms/LRGB.c
+++ b/libX11/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;
@@ -802,7 +802,7 @@ FreeBlueTbl:
Xfree((char *)pScreenData->pBlueTbl);
FreeGreenTblElements:
- Xfree((char *)pScreenData->pBlueTbl->pBase);
+ Xfree((char *)pScreenData->pGreenTbl->pBase);
FreeGreenTbl:
Xfree((char *)pScreenData->pGreenTbl);
@@ -817,7 +817,7 @@ Free_property_return:
Xfree ((char *)property_return);
FreeSCCData:
- Xfree((char *)pScreenData);
+ Xfree((char *)pScreenDefaultData);
pPerScrnInfo->state = XcmsInitNone;
return(XcmsFailure);
}