diff -r eadc463e16db -r a66ed8458668 jdk/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c --- a/jdk/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c Thu Dec 08 07:21:50 2016 -0800 +++ b/jdk/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c Wed Nov 30 13:51:41 2016 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,6 +72,7 @@ unsigned char *pixelPtr; SurfaceDataRasInfo lockInfo; SurfaceDataOps *ops; + lockInfo.rasBase = NULL; ops = SurfaceData_GetOps(env, sd); JNU_CHECK_EXCEPTION_RETURN(env, -1); @@ -113,7 +114,7 @@ SurfaceDataRasInfo lockInfo; SurfaceDataOps *ops; unsigned char *pixelPtr; - + lockInfo.rasBase = NULL; ops = SurfaceData_GetOps(env, sd); JNU_CHECK_EXCEPTION(env);