Match PyUnicode_AsUnicode signature in UCS2/UCS4

vmuriart · vmuriart · commit ccd4521298e8 · 2017-02-27T18:58:05.000-07:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1572,7 +1572,7 @@ internal unsafe static extern int
 
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             ExactSpelling = true, CharSet = CharSet.Unicode)]
-        internal unsafe static extern char*
+        internal unsafe static extern IntPtr
             PyUnicode_AsUnicode(IntPtr ob);
 
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
@@ -1613,7 +1613,7 @@ internal unsafe static extern int
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             EntryPoint = "PyUnicodeUCS2_AsUnicode",
             ExactSpelling = true)]
-        internal unsafe static extern char*
+        internal unsafe static extern IntPtr
             PyUnicode_AsUnicode(IntPtr ob);
 
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
@@ -1749,9 +1749,9 @@ internal unsafe static string GetManagedString(IntPtr op)
                 Marshal.Copy(p, buffer, 0, size);
                 return Encoding.UTF32.GetString(buffer, 0, size);
 #elif UCS2
-                char* p = Runtime.PyUnicode_AsUnicode(op);
-                int size = Runtime.PyUnicode_GetSize(op);
-                return new String(p, 0, size);
+                IntPtr p = Runtime.PyUnicode_AsUnicode(op);
+                int length = Runtime.PyUnicode_GetSize(op);
+                return Marshal.PtrToStringUni(p, length);
 #endif
             }
 
