Merge pull request #2 from robxyy/robx/nsdata/2022-09-26

Thanks!
ctripcorp · Sep 29, 2022 · 39c3f69 · 39c3f69
2 parents d52108b + aec124b
commit 39c3f69
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/mmkv-kotlin/src/appleMain/kotlin/com/ctrip/flight/mmkv/Binary.kt b/mmkv-kotlin/src/appleMain/kotlin/com/ctrip/flight/mmkv/Binary.kt
@@ -29,9 +29,14 @@ import platform.posix.memcpy
  * @author yaqiao
  */
 
-internal fun NSData.toByteArray(): ByteArray = ByteArray(this@toByteArray.length.toInt()).apply {
-    usePinned {
-        memcpy(it.addressOf(0), this@toByteArray.bytes, this@toByteArray.length)
+internal fun NSData.toByteArray(): ByteArray {
+    val size = length.toInt()
+    return ByteArray(size).apply {
+        if (size != 0) {
+            usePinned {
+                memcpy(it.addressOf(0), bytes, length)
+            }
+        }
     }
 }
 

diff --git a/mmkv-kotlin/src/appleTest/kotlin/com/ctrip/flight/mmkv/MMKVKMMTestIos.kt b/mmkv-kotlin/src/appleTest/kotlin/com/ctrip/flight/mmkv/MMKVKMMTestIos.kt
@@ -85,4 +85,12 @@ class MMKVKotlinTestIos {
         val value1 = mmkvImpl.takeObject(MMKVKotlinTest.KEY_NOT_EXIST, NSArray.`class`()!!)
         assertEquals(value1, null)
     }
+
+    @Test
+    fun emptyNsDataToByteArray() {
+        @Suppress("CAST_NEVER_SUCCEEDS")
+        val data = ("" as NSString).dataUsingEncoding(NSUTF8StringEncoding) as NSData
+        val bytes = data.toByteArray()
+        assert(bytes.isEmpty())
+    }
 }