Mercurial > hg > openjdk > bsd-port > jdk
changeset 8517:9d3243b721e7
8160098: Clean up color profiles
Reviewed-by: ssadetsky, bpb, mschoene
author | prr |
---|---|
date | Thu, 14 Jul 2016 12:28:15 -0700 |
parents | fc57f998eacb |
children | fb281fa4e44c |
files | src/share/native/sun/java2d/cmm/lcms/cmsio0.c |
diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/sun/java2d/cmm/lcms/cmsio0.c Wed Sep 10 11:01:59 2014 +0200 +++ b/src/share/native/sun/java2d/cmm/lcms/cmsio0.c Thu Jul 14 12:28:15 2016 -0700 @@ -1533,6 +1533,13 @@ // 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);