Write terminating 0 byte

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CArrayWrappers.java

@@ -40,6 +40,12 @@
  */
 package com.oracle.graal.python.builtins.objects.cext.common;
 
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_GET_BYTE_ARRAY_TYPE_ID;
+
+import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext.LLVMType;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetLLVMType;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.IsPointerNode;
@@ -63,13 +69,8 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
-import sun.misc.Unsafe;
 
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-
-import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_GET_BYTE_ARRAY_TYPE_ID;
+import sun.misc.Unsafe;
 
 /**
  * Native wrappers for managed objects such that they can be used as a C array by native code. The
@@ -98,10 +99,13 @@ private static Unsafe getUnsafe() {
      * the copies the contents to the native memory.
      */
     @TruffleBoundary
-    public static long byteArrayToNativeInt8(byte[] data) {
-        int size = data.length * Byte.BYTES;
+    public static long byteArrayToNativeInt8(byte[] data, boolean writeNullTerminator) {
+        int size = (data.length + (writeNullTerminator ? 1 : 0)) * Byte.BYTES;
         long ptr = UNSAFE.allocateMemory(size);
         UNSAFE.copyMemory(data, Unsafe.ARRAY_BYTE_BASE_OFFSET, null, ptr, size);
+        if (writeNullTerminator) {
+            UNSAFE.putByte(ptr + data.length * Byte.BYTES, (byte) 0);
+        }
         return ptr;
     }
 
@@ -140,7 +144,7 @@ public static long stringToNativeUtf8Bytes(String string) {
         ByteBuffer encoded = StandardCharsets.UTF_8.encode(string);
         byte[] data = new byte[encoded.remaining() + 1];
         encoded.get(data, 0, data.length - 1);
-        return byteArrayToNativeInt8(data);
+        return byteArrayToNativeInt8(data, true);
     }
 
     @TruffleBoundary
@@ -326,7 +330,7 @@ void toNative(
                         @Exclusive @Cached InvalidateNativeObjectsAllManagedNode invalidateNode) {
             invalidateNode.execute();
             if (!lib.isNative(this)) {
-                setNativePointer(byteArrayToNativeInt8(getByteArray(lib)));
+                setNativePointer(byteArrayToNativeInt8(getByteArray(lib), true));
             }
         }
     }

graalpython/lib-graalpython/modules/hpy/test/test_argparse.py

@@ -84,8 +84,6 @@ def test_b(self):
             "function unsigned byte integer is less than minimum"
         )
 
-    # TODO(fa): needs to be fixed
-    @pytest.mark.skip
     def test_s(self):
         import pytest
         mod = self.make_parse_item("s", "const char*", "HPyUnicode_FromString")