summaryrefslogtreecommitdiff
path: root/third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-08-14 10:36:01 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-14 15:02:17 +0000
commit0bd847232a1f430c70dd9d8df177ce68a3cde010 (patch)
tree15cec8c11493549f1974ae2f6aeac58234c176d2 /third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch
parentdff02cee2d2410d81a55c59345fb38b5aac8a457 (diff)
downloadpdfium-0bd847232a1f430c70dd9d8df177ce68a3cde010.tar.xz
LCMS: upgrade to 2.8
This CL upgrades LCMS from version 2.6 to 2.8. All changes from LCMS original version 2.8 are stored in patch files: - Patch 0: memory management modifications to use PDFium methods. This was previously not in any patch, so the changes were manually applied. - Patches 1-5: new patch files corresponding to old changes that can be seen in the history, but did not previously have patch files. - Patches 6-25: previous patches (patch numbers shifted by 6). The one for from16-to-8-overflow.patch was deleted as it was already upstream. Some patches did not apply cleanly so their .patch files were modified. - Patch 26: as I just moved files directly, unsupported characters were moved in unchanged, so I had to fix all of them: e with tilde and other characters were replaced to allow compilation on Windows. - Patch 27: Went over the code and re-applied changes that included comments clearly indicating this was Foxit. These changes are all already seen in the initial PDFium commit. Change-Id: Ic1d84e54803ef9e6b280ef7619bbf0b757312fbf Reviewed-on: https://pdfium-review.googlesource.com/10590 Commit-Queue: Nicolás Peña <npm@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch')
-rw-r--r--third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch b/third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch
deleted file mode 100644
index 472bcadf05..0000000000
--- a/third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
-index 15199c7..04dd0c4 100644
---- a/third_party/lcms/src/cmstypes.c
-+++ b/third_party/lcms/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;
- }
-