summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-07-18 20:27:59 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-07-18 20:27:59 +0000
commit649815d0d6e57f3a551e73ae464589b0dedf913d (patch)
treead771a6f1b7e783a28709d53b61bb1ebafad1ede /third_party
parent835d49d1534405075d75068635894ead17af56b8 (diff)
downloadpdfium-649815d0d6e57f3a551e73ae464589b0dedf913d.tar.xz
Handle wrong tag element count in littlecms.
BUG=chromium:864932 Change-Id: I7e87ba6e0fc6e2bdefcee29cbc0b60cb9ec9e316 Reviewed-on: https://pdfium-review.googlesource.com/38270 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/lcms/0031-wrong-tag-element-count.patch12
-rw-r--r--third_party/lcms/README.pdfium1
-rw-r--r--third_party/lcms/src/cmsio0.c1
3 files changed, 14 insertions, 0 deletions
diff --git a/third_party/lcms/0031-wrong-tag-element-count.patch b/third_party/lcms/0031-wrong-tag-element-count.patch
new file mode 100644
index 0000000000..a62bc3de6d
--- /dev/null
+++ b/third_party/lcms/0031-wrong-tag-element-count.patch
@@ -0,0 +1,12 @@
+diff --git a/third_party/lcms/src/cmsio0.c b/third_party/lcms/src/cmsio0.c
+index cc5f89064..63bbe36a8 100644
+--- a/third_party/lcms/src/cmsio0.c
++++ b/third_party/lcms/src/cmsio0.c
+@@ -1616,6 +1616,7 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig)
+ _cmsTagSignature2String(String, sig);
+ cmsSignalError(Icc ->ContextID, cmsERROR_CORRUPTION_DETECTED, "'%s' Inconsistent number of items: expected %d, got %d",
+ String, TagDescriptor ->ElemCount, ElemCount);
++ goto Error;
+ }
+
+
diff --git a/third_party/lcms/README.pdfium b/third_party/lcms/README.pdfium
index 0c7dff4de2..f5ea9b1792 100644
--- a/third_party/lcms/README.pdfium
+++ b/third_party/lcms/README.pdfium
@@ -42,3 +42,4 @@ Local Modifications:
0028-do-not-quickfloor.patch: flooring errors may cause heap-buffer-overflow.
0029-drop-register-keyword.patch: Remove deprecated 'register' keyword.
0030-const-data.patch: Mark many data structures as const.
+0031-wrong-tag-element-count.patch: Handle tag element count mismatch as an error.
diff --git a/third_party/lcms/src/cmsio0.c b/third_party/lcms/src/cmsio0.c
index cc5f890644..63bbe36a83 100644
--- a/third_party/lcms/src/cmsio0.c
+++ b/third_party/lcms/src/cmsio0.c
@@ -1616,6 +1616,7 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig)
_cmsTagSignature2String(String, sig);
cmsSignalError(Icc ->ContextID, cmsERROR_CORRUPTION_DETECTED, "'%s' Inconsistent number of items: expected %d, got %d",
String, TagDescriptor ->ElemCount, ElemCount);
+ goto Error;
}