Display and control your Android device
Truncate device name at UTF-8 code point boundary
Romain Vimont8604f16b3089
diff --git a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.javaindex a26c74cd..a725d83d 100644--- a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java+++ b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java@@ -89,7 +89,7 @@ public final class DesktopConnection implements Closeable {byte[] buffer = new byte[DEVICE_NAME_FIELD_LENGTH + 4];byte[] deviceNameBytes = deviceName.getBytes(StandardCharsets.UTF_8);- int len = Math.min(DEVICE_NAME_FIELD_LENGTH - 1, deviceNameBytes.length);+ int len = StringUtils.getUtf8TruncationIndex(deviceNameBytes, DEVICE_NAME_FIELD_LENGTH - 1);System.arraycopy(deviceNameBytes, 0, buffer, 0, len);// byte[] are always 0-initialized in java, no need to set '\0' explicitly