[GR-21297] Get[Primitive]ByteArrayElements overwrites memory adjacent to passed pointer.

PullRequest: graal/5498

Author: peter-hofer

substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIGeneratedMethodSupport.java

@@ -29,7 +29,7 @@
 import java.lang.reflect.Array;
 
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
-import org.graalvm.nativeimage.c.type.CIntPointer;
+import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.WordBase;
 import org.graalvm.word.WordFactory;
@@ -106,10 +106,10 @@ static void rethrowPendingException() throws Throwable {
         }
     }
 
-    static PointerBase pinArrayAndGetAddress(Object array, CIntPointer isCopy) throws Throwable {
+    static PointerBase pinArrayAndGetAddress(Object array, CCharPointer isCopy) throws Throwable {
         if (array.getClass().isArray()) {
             if (isCopy.isNonNull()) {
-                isCopy.write(0);
+                isCopy.write((byte) 0);
             }
             return JNIThreadLocalPinnedObjects.pinArrayAndGetAddress(array);
         }

substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java

@@ -40,7 +40,7 @@
 import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
 import org.graalvm.compiler.nodes.java.NewArrayNode;
 import org.graalvm.nativeimage.c.function.CEntryPoint.FatalExceptionHandler;
-import org.graalvm.nativeimage.c.type.CIntPointer;
+import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.WordPointer;
 
 import com.oracle.graal.pointsto.meta.HostedProviders;
@@ -135,7 +135,7 @@ private SimpleSignature createSignature(MetaAccessProvider metaAccess) {
         } else {
             args.add(objectHandleType); // j<PrimitiveType>Array array;
             if (operation == Operation.GET_ELEMENTS) {
-                args.add(metaAccess.lookupJavaType(CIntPointer.class)); // jboolean *isCopy;
+                args.add(metaAccess.lookupJavaType(CCharPointer.class)); // jboolean *isCopy;
                 returnType = metaAccess.lookupJavaType(WordPointer.class);
             } else if (operation == Operation.RELEASE_ELEMENTS) {
                 args.add(metaAccess.lookupJavaType(WordPointer.class)); // NativeType *elems;

substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/nativeapi/JNIFunctionPointerTypes.java

@@ -27,7 +27,6 @@
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
 import org.graalvm.nativeimage.c.type.CCharPointer;
-import org.graalvm.nativeimage.c.type.CIntPointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.WordBase;
 
@@ -118,7 +117,7 @@ public interface CallLongMethod2FunctionPointer extends CallLongMethodFunctionPo
 
     public interface GetStringUTFCharsFunctionPointer extends CFunctionPointer {
         @InvokeCFunctionPointer
-        CCharPointer invoke(JNIEnvironment env, JNIObjectHandle str, CIntPointer isCopy);
+        CCharPointer invoke(JNIEnvironment env, JNIObjectHandle str, CCharPointer isCopy);
     }
 
     public interface ReleaseStringUTFCharsFunctionPointer extends CFunctionPointer {