Remove null terminator from Base38 String in kotlin

project-chip · Jun 30, 2023 · d5bae01 · d5bae01
1 parent a8d7e41
commit d5bae01
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/src/controller/java/src/chip/onboardingpayload/Base38.kt b/src/controller/java/src/chip/onboardingpayload/Base38.kt
@@ -54,7 +54,7 @@ fun base38Encode(inBuf: ByteArray, outBuf: CharArray): Unit {
 
     val base38CharactersNeeded = kBase38CharactersNeededInNBytesChunk[bytesInChunk - 1].toByte()
 
-    if ((outIdx + base38CharactersNeeded) >= outBuf.size) {
+    if ((outIdx + base38CharactersNeeded) > outBuf.size) {
       throw OnboardingPayloadException("Buffer is too small")
     }
 
@@ -63,12 +63,6 @@ fun base38Encode(inBuf: ByteArray, outBuf: CharArray): Unit {
       value /= kRadix.toInt()
     }
   }
-
-  if (outIdx < outBuf.size) {
-    outBuf[outIdx] = '\u0000'
-  } else {
-    throw OnboardingPayloadException("Buffer is too small")
-  }
 }
 
 /*

diff --git a/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt b/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt
@@ -27,7 +27,7 @@ class QRCodeBasicOnboardingPayloadGenerator(private val payload: OnboardingPaylo
 
   /**
    * This function is called to encode the binary data of a payload to a
-   * base38 null-terminated string.
+   * base38 string.
    *
    * The resulting size of the outBuffer span will be the size of data written.
    *

diff --git a/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt b/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt
@@ -111,12 +111,11 @@ class QRCodeOnboardingPayloadGenerator(private val onboardingPayload: Onboarding
     }
 
     var tlvDataLengthInBytes = generateTLVFromOptionalData(onboardingPayload, tlvDataStart, tlvDataStartSize)
-
     val bits = ByteArray(kTotalPayloadDataSizeInBytes + tlvDataLengthInBytes)
     val buffer = CharArray(base38EncodedLength(bits.size) + kQRCodePrefix.length)
     payloadBase38RepresentationWithTLV(onboardingPayload, buffer, bits, tlvDataStart, tlvDataLengthInBytes)
 
-    return buffer.toString()
+    return String(buffer)
   }
 
   private fun generateTLVFromOptionalData(