You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.5 KiB
36 lines
1.5 KiB
diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c |
|
index 15199c7..04dd0c4 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; |
|
} |
|
|
|
|