From bc6f9d7cb6678cb416b3c35647c90e0d9f46a8f6 Mon Sep 17 00:00:00 2001
From: prr <unknown>
Date: Thu, 14 Jul 2016 12:28:15 -0700
Subject: [PATCH] 8160098: Clean up color profiles Reviewed-by: ssadetsky, bpb,
 mschoene

---
 src/share/native/sun/java2d/cmm/lcms/cmsio0.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/share/native/sun/java2d/cmm/lcms/cmsio0.c b/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
index cbaffb8a1..3811ef935 100644
--- a/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+++ b/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
@@ -1516,6 +1516,13 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig)
     // If the element is already in memory, return the pointer
     if (Icc -> TagPtrs[n]) {
 
+        if (Icc -> TagTypeHandlers[n] == NULL) goto Error;
+        BaseType = Icc -> TagTypeHandlers[n]->Signature;
+        if (BaseType == 0) goto Error;
+        TagDescriptor = _cmsGetTagDescriptor(Icc-> ContextID, sig);
+        if (TagDescriptor == NULL) goto Error;
+        if (!IsTypeSupported(TagDescriptor, BaseType)) goto Error;
+
         if (Icc ->TagSaveAsRaw[n]) goto Error;  // We don't support read raw tags as cooked
 
         _cmsUnlockMutex(Icc->ContextID, Icc ->UsrMutex);
-- 
GitLab