summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Chang <ochang@chromium.org>2016-02-05 14:57:01 -0800
committerOliver Chang <ochang@chromium.org>2016-02-05 14:57:01 -0800
commit5ef071fe48737c9e5d6165825404755ce2c877c9 (patch)
treea482eced91c382dce752b8b9539fd15addedf481
parent360bc5ffb58e001dc7694967d79b29d54a935337 (diff)
downloadpdfium-5ef071fe48737c9e5d6165825404755ce2c877c9.tar.xz
lcms2: Fix a type confusion.chromium/2645chromium/2644chromium/2643
R=tsepez@chromium.org BUG=584223 Review URL: https://codereview.chromium.org/1672163002 .
-rw-r--r--third_party/lcms2-2.6/0000-tag-type-confusion.patch14
-rw-r--r--third_party/lcms2-2.6/README.pdfium13
-rw-r--r--third_party/lcms2-2.6/src/cmsio0.c3
3 files changed, 29 insertions, 1 deletions
diff --git a/third_party/lcms2-2.6/0000-tag-type-confusion.patch b/third_party/lcms2-2.6/0000-tag-type-confusion.patch
new file mode 100644
index 0000000000..df94cb7bfe
--- /dev/null
+++ b/third_party/lcms2-2.6/0000-tag-type-confusion.patch
@@ -0,0 +1,14 @@
+diff --git a/third_party/lcms2-2.6/src/cmsio0.c b/third_party/lcms2-2.6/src/cmsio0.c
+index 6549d15..5f9f08a 100644
+--- a/third_party/lcms2-2.6/src/cmsio0.c
++++ b/third_party/lcms2-2.6/src/cmsio0.c
+@@ -719,7 +719,8 @@ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc)
+ for (j=0; j < Icc ->TagCount; j++) {
+
+ if ((Icc ->TagOffsets[j] == Tag.offset) &&
+- (Icc ->TagSizes[j] == Tag.size)) {
++ (Icc ->TagSizes[j] == Tag.size) &&
++ (Icc ->TagNames[j] == Tag.sig)) {
+
+ Icc ->TagLinked[Icc ->TagCount] = Icc ->TagNames[j];
+ }
diff --git a/third_party/lcms2-2.6/README.pdfium b/third_party/lcms2-2.6/README.pdfium
new file mode 100644
index 0000000000..19d2f68604
--- /dev/null
+++ b/third_party/lcms2-2.6/README.pdfium
@@ -0,0 +1,13 @@
+Name: Little CMS
+URL: http://www.littlecms.com/
+Version: 2.6
+Security Critical: yes
+License: MIT License
+
+Description:
+Color Management Engine.
+
+Local Modifications:
+
+0000-tag-type-confusion.patch: Fix a type confusion.
+TODO(ochang): List other patches.
diff --git a/third_party/lcms2-2.6/src/cmsio0.c b/third_party/lcms2-2.6/src/cmsio0.c
index 6549d15d9e..5f9f08a6f8 100644
--- a/third_party/lcms2-2.6/src/cmsio0.c
+++ b/third_party/lcms2-2.6/src/cmsio0.c
@@ -719,7 +719,8 @@ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc)
for (j=0; j < Icc ->TagCount; j++) {
if ((Icc ->TagOffsets[j] == Tag.offset) &&
- (Icc ->TagSizes[j] == Tag.size)) {
+ (Icc ->TagSizes[j] == Tag.size) &&
+ (Icc ->TagNames[j] == Tag.sig)) {
Icc ->TagLinked[Icc ->TagCount] = Icc ->TagNames[j];
}