From a994f51402ff9ff2cca65635cf9418baffe56d43 Mon Sep 17 00:00:00 2001
From: Abduqodiri Qurbonzoda <abduqodiri.qurbonzoda@jetbrains.com>
Date: Fri, 14 Jun 2019 15:32:54 +0300
Subject: [PATCH] Handle zero-terminated strings in deprecated utf8 to String
 conversions (#3068)

---
 runtime/src/main/kotlin/kotlin/Exceptions.kt  |  1 -
 runtime/src/main/kotlin/kotlin/native/Text.kt | 20 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/runtime/src/main/kotlin/kotlin/Exceptions.kt b/runtime/src/main/kotlin/kotlin/Exceptions.kt
index 6393c12ca1a..84a2fef0d01 100644
--- a/runtime/src/main/kotlin/kotlin/Exceptions.kt
+++ b/runtime/src/main/kotlin/kotlin/Exceptions.kt
@@ -166,7 +166,6 @@ public actual open class NumberFormatException : IllegalArgumentException {
     actual constructor(message: String?) : super(message)
 }
 
-@Deprecated("Use CharacterCodingException instead", ReplaceWith("CharacterCodingException"))
 public open class IllegalCharacterConversionException : IllegalArgumentException {
 
     constructor(): super()
diff --git a/runtime/src/main/kotlin/kotlin/native/Text.kt b/runtime/src/main/kotlin/kotlin/native/Text.kt
index 7c64e0308ef..740c91a48cc 100644
--- a/runtime/src/main/kotlin/kotlin/native/Text.kt
+++ b/runtime/src/main/kotlin/kotlin/native/Text.kt
@@ -9,31 +9,34 @@ package kotlin.native
 /**
  * Converts an UTF-8 array into a [String]. Replaces invalid input sequences with a default character.
  */
-@Deprecated("Use decodeToString instead", ReplaceWith("decodeToString()"))
 public fun ByteArray.stringFromUtf8() : String {
-    @Suppress("DEPRECATION")
     return this.stringFromUtf8(0, this.size)
 }
 
 /**
  * Converts an UTF-8 array into a [String]. Replaces invalid input sequences with a default character.
  */
-@Deprecated("Use decodeToString instead", ReplaceWith("decodeToString(start, start + size)"))
 public fun ByteArray.stringFromUtf8(start: Int = 0, size: Int = this.size) : String {
     checkBoundsIndexes(start, start + size, this.size)
-    return stringFromUtf8Impl(start, size)
+    return stringFromUtf8Impl(start, realSize(this, size))
 }
 
 @SymbolName("Kotlin_ByteArray_stringFromUtf8")
 internal external fun ByteArray.stringFromUtf8Impl(start: Int, size: Int) : String
 
+private fun realSize(byteArray: ByteArray, size: Int): Int {
+    var realSize = 0
+    while (realSize < size && byteArray[realSize] != 0.toByte()) {
+        realSize++
+    }
+    return realSize
+}
+
 /**
  * Converts an UTF-8 array into a [String].
  * @throws [IllegalCharacterConversionException] if the input is invalid.
  */
-@Deprecated("Use decodeToString instead", ReplaceWith("decodeToString(throwOnInvalidSequence = true)"))
 public fun ByteArray.stringFromUtf8OrThrow() : String {
-    @Suppress("DEPRECATION")
     return this.stringFromUtf8OrThrow(0, this.size)
 }
 
@@ -41,13 +44,11 @@ public fun ByteArray.stringFromUtf8OrThrow() : String {
  * Converts an UTF-8 array into a [String].
  * @throws [IllegalCharacterConversionException] if the input is invalid.
  */
-@Deprecated("Use decodeToString instead", ReplaceWith("decodeToString(start, start + size, throwOnInvalidSequence = true)"))
 public fun ByteArray.stringFromUtf8OrThrow(start: Int = 0, size: Int = this.size) : String {
     checkBoundsIndexes(start, start + size, this.size)
     try {
-        return stringFromUtf8OrThrowImpl(start, size)
+        return stringFromUtf8OrThrowImpl(start, realSize(this, size))
     } catch (e: CharacterCodingException) {
-        @Suppress("DEPRECATION")
         throw IllegalCharacterConversionException()
     }
 }
@@ -96,7 +97,6 @@ public fun String.toUtf8OrThrow(start: Int = 0, size: Int = this.length) : ByteA
     try {
         return toUtf8OrThrowImpl(start, size)
     } catch (e: CharacterCodingException) {
-        @Suppress("DEPRECATION")
         throw IllegalCharacterConversionException()
     }
 }