Index: third_party/lcms2-2.6/src/cmstypes.c |
diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c |
index 15199c7084c9da7d3ca480b6f6b9ef73becd5c7b..04dd0c4e001ece93213d99e343ea8b095f12afe1 100644 |
--- a/third_party/lcms2-2.6/src/cmstypes.c |
+++ b/third_party/lcms2-2.6/src/cmstypes.c |
@@ -3968,7 +3968,7 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND |
case cmsSigSampledCurveSeg: { |
cmsUInt32Number Count; |
- if (!_cmsReadUInt32Number(io, &Count)) return NULL; |
+ if (!_cmsReadUInt32Number(io, &Count)) goto Error; |
Segments[i].nGridPoints = Count; |
Segments[i].SampledPoints = (cmsFloat32Number*) _cmsCalloc(self ->ContextID, Count, sizeof(cmsFloat32Number)); |
@@ -3987,7 +3987,7 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND |
_cmsTagSignature2String(String, (cmsTagSignature) ElementSig); |
cmsSignalError(self->ContextID, cmsERROR_UNKNOWN_EXTENSION, "Unknown curve element type '%s' found.", String); |
} |
- return NULL; |
+ goto Error; |
} |
} |
@@ -4001,7 +4001,12 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND |
return Curve; |
Error: |
- if (Segments) _cmsFree(self ->ContextID, Segments); |
+ if (Segments) { |
+ for (i=0; i < nSegments; i++) { |
+ if (Segments[i].SampledPoints) _cmsFree(self ->ContextID, Segments[i].SampledPoints); |
+ } |
+ _cmsFree(self ->ContextID, Segments); |
+ } |
return NULL; |
} |