From 69393985213138482eed39a773ec55a70b8a82ba Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 2 Feb 2017 12:20:56 +0700 Subject: [PATCH] Interop/Runtime: fix major bug: alloc C strings using correct placement --- Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt index 33d27eafcc5..cfd1b49d7a7 100644 --- a/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt +++ b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt @@ -187,7 +187,7 @@ fun CString.Companion.fromString(str: String?, placement: NativePlacement): CStr val bytes = encodeToUtf8(str) // TODO: encoding val len = bytes.size - val nativeBytes = nativeHeap.allocArray(len + 1) + val nativeBytes = placement.allocArray(len + 1) nativeMemUtils.putByteArray(bytes, nativeBytes[0], len) nativeBytes[len].value = 0