summaryrefslogtreecommitdiff
path: root/third_party/lcms/0010-memory-leak-Type_Curve_Read.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/0010-memory-leak-Type_Curve_Read.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/0010-memory-leak-Type_Curve_Read.patch')
-rw-r--r--third_party/lcms/0010-memory-leak-Type_Curve_Read.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/third_party/lcms/0010-memory-leak-Type_Curve_Read.patch b/third_party/lcms/0010-memory-leak-Type_Curve_Read.patch
new file mode 100644
index 0000000000..7edc7f9e0f
--- /dev/null
+++ b/third_party/lcms/0010-memory-leak-Type_Curve_Read.patch
@@ -0,0 +1,28 @@
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
+index 06742b5..9fe5e2a 100644
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
+@@ -1112,7 +1112,10 @@ void *Type_Curve_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cm
+ NewGamma = cmsBuildTabulatedToneCurve16(self ->ContextID, Count, NULL);
+ if (!NewGamma) return NULL;
+
+- if (!_cmsReadUInt16Array(io, Count, NewGamma -> Table16)) return NULL;
++ if (!_cmsReadUInt16Array(io, Count, NewGamma -> Table16)) {
++ cmsFreeToneCurve(NewGamma);
++ return NULL;
++ }
+
+ *nItems = 1;
+ return NewGamma;
+@@ -2350,7 +2353,10 @@ cmsStage* ReadCLUT(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUI
+
+ for (i=0; i < Data ->nEntries; i++) {
+
+- if (io ->Read(io, &v, sizeof(cmsUInt8Number), 1) != 1) return NULL;
++ if (io ->Read(io, &v, sizeof(cmsUInt8Number), 1) != 1) {
++ cmsStageFree(CLUT);
++ return NULL;
++ }
+ Data ->Tab.T[i] = FROM_8_TO_16(v);
+ }
+