From 8529ed6a629f93a4443eb01684c90a7a58a42a45 Mon Sep 17 00:00:00 2001 From: jchen Date: Fri, 17 May 2013 10:04:39 -0700 Subject: [PATCH] 8003444: Fix potential NULL pointer dereference Reviewed-by: jgodinez, prr --- src/share/native/sun/java2d/cmm/lcms/cmscgats.c | 2 ++ src/share/native/sun/java2d/cmm/lcms/cmslut.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/share/native/sun/java2d/cmm/lcms/cmscgats.c b/src/share/native/sun/java2d/cmm/lcms/cmscgats.c index 15a243944..bf5015604 100644 --- a/src/share/native/sun/java2d/cmm/lcms/cmscgats.c +++ b/src/share/native/sun/java2d/cmm/lcms/cmscgats.c @@ -634,6 +634,8 @@ cmsFloat64Number ParseFloatNumber(const char *Buffer) cmsFloat64Number dnum = 0.0; int sign = 1; + if (Buffer == NULL) return 0.0; + if (*Buffer == '-' || *Buffer == '+') { sign = (*Buffer == '-') ? -1 : 1; diff --git a/src/share/native/sun/java2d/cmm/lcms/cmslut.c b/src/share/native/sun/java2d/cmm/lcms/cmslut.c index 76b14238b..6fc76a8b9 100644 --- a/src/share/native/sun/java2d/cmm/lcms/cmslut.c +++ b/src/share/native/sun/java2d/cmm/lcms/cmslut.c @@ -1021,6 +1021,8 @@ cmsStage* _cmsStageAllocLabV2ToV4curves(cmsContext ContextID) mpe = cmsStageAllocToneCurves(ContextID, 3, LabTable); cmsFreeToneCurveTriple(LabTable); + if (mpe == NULL) return NULL; + mpe ->Implements = cmsSigLabV2toV4; return mpe; } -- GitLab