Fix bug in getString involving character encoding

LandryNorris · Jul 14, 2022 · b0b21e5 · b0b21e5
1 parent 046f92d
commit b0b21e5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/jni-utils/src/commonMain/kotlin/io/github/landrynorris/jniutils/StringOperations.kt b/jni-utils/src/commonMain/kotlin/io/github/landrynorris/jniutils/StringOperations.kt
@@ -25,8 +25,8 @@ fun CPointer<JNIEnvVar>.getStringChars(string: jstring): CPointer<jcharVar>? {
 }
 
 fun CPointer<JNIEnvVar>.getString(string: jstring): String {
-    val chars = getStringChars(string)
-    return chars?.toKString() ?: error("Unable to create a String from the given jstring")
+    val chars = getStringUTFChars(string)
+    return chars?.toKStringFromUtf8() ?: error("Unable to create a String from the given jstring")
 }
 
 fun CPointer<JNIEnvVar>.releaseStringChars(string: jstring, chars: CPointer<jcharVar>?) {

diff --git a/sample/src/androidMain/jniLibs/arm64-v8a/libsample.so b/sample/src/androidMain/jniLibs/arm64-v8a/libsample.so
diff --git a/sample/src/androidMain/jniLibs/armeabi-v7a/libsample.so b/sample/src/androidMain/jniLibs/armeabi-v7a/libsample.so
diff --git a/sample/src/androidMain/jniLibs/x86/libsample.so b/sample/src/androidMain/jniLibs/x86/libsample.so
diff --git a/sample/src/androidMain/jniLibs/x86_64/libsample.so b/sample/src/androidMain/jniLibs/x86_64/libsample.so