From e2ce49c30e21298ea7358e3744a8618cffcec530 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 29 Oct 2018 16:47:55 +0000
Subject: [PATCH] Use safe UTF-8 decoding in BdfReaderImpl.
---
.../main/java/org/briarproject/bramble/data/BdfReaderImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java
index d73e5609bd..788826a575 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/data/BdfReaderImpl.java
@@ -29,6 +29,7 @@ import static org.briarproject.bramble.data.Types.STRING_16;
import static org.briarproject.bramble.data.Types.STRING_32;
import static org.briarproject.bramble.data.Types.STRING_8;
import static org.briarproject.bramble.data.Types.TRUE;
+import static org.briarproject.bramble.util.StringUtils.fromUtf8;
@NotThreadSafe
@NotNullByDefault
@@ -253,7 +254,7 @@ class BdfReaderImpl implements BdfReader {
if (length < 0 || length > maxBufferSize) throw new FormatException();
if (length == 0) return "";
readIntoBuffer(length);
- return new String(buf, 0, length, "UTF-8");
+ return fromUtf8(buf, 0, length);
}
private int readStringLength() throws IOException {
--
GitLab