[OpenJDK 2D-Dev] review backport fix of 8081756 to 8u-dev

[Sergey Bylokhov]

Looks fine.

On 10.06.15 23:25, Phil Race wrote:
> Andrew/Sergey,
>
> Could one of you please be a 'sanity check' backport reviewer on
> this backport of a missing check for NULL in LittleCMS code.
>
> It is identical to the JDK 9 changeset : - 
> http://hg.openjdk.java.net/jdk9/client/jdk/rev/80e814d165f9
>
> BTW I already sent that to upstream ..
>
> diff --git a/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 
> b/src/share/native/sun/java2d/cmm/lcms/cmsopt.c
> --- a/src/share/native/sun/java2d/cmm/lcms/cmsopt.c
> +++ b/src/share/native/sun/java2d/cmm/lcms/cmsopt.c
> @@ -260,7 +260,9 @@
>                              cmsStage* Multmat = 
> cmsStageAllocMatrix(Lut->ContextID, 3, 3, (const cmsFloat64Number*) 
> &res, NULL);
>
>                              // Recover the chain
> +                            if (Multmat != NULL) {
>                              Multmat->Next = chain;
> +                            }
>                              *pt1 = Multmat;
>                       }
>
> -phil.


-- 
Best regards, Sergey.