ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cid#1545515 Dm: Dubious method used

Browse Source 
Change-Id: Ife18effd9e477e977e555aea03a78b312e99c6c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157472
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2023-10-02 09:33:48 +02:00
parent d96f8e8761
commit d4f7f7b22b
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/java_websocket/UnpackedTarball_java_websocket.mk
Vendored
+1
View File
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,java_websocket,\
external/java_websocket/patches/0002-cid-1545284-UR-Uninitialized-read-of-field-in-constr.patch \
external/java_websocket/patches/0001-cid-1546292-DLS-Dead-local-store.patch \
external/java_websocket/patches/0001-cid-1545227-Dm-Dubious-method-used.patch \
external/java_websocket/patches/0001-cid-1545515-Dm-Dubious-method-used.patch \
))
# vim: set noet sw=4 ts=4:
external/java_websocket/patches/0001-cid-1545515-Dm-Dubious-method-used.patch
Vendored
+42
View File
@@ -0,0 +1,42 @@
From 695941c8da3e6cefa0553996773a8cf8673bb00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
Date: Sun, 1 Oct 2023 19:50:02 +0100
Subject: [PATCH] cid#1545515 Dm: Dubious method used
---
src/main/java/org/java_websocket/WebSocketImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
index 85fd413..926f330 100644
--- a/src/main/java/org/java_websocket/WebSocketImpl.java
+++ b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -30,6 +30,7 @@
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
import java.nio.channels.SelectionKey;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -227,7 +228,7 @@
if (log.isLoggable(Level.FINE)) {
log.fine("process({}): ({})" + " : " + socketBuffer.remaining() + " : " +
(socketBuffer.remaining() > 1000 ? "too big to display"
- : new String(socketBuffer.array(), socketBuffer.position(), socketBuffer.remaining())));
+ : new String(socketBuffer.array(), socketBuffer.position(), socketBuffer.remaining(), StandardCharsets.US_ASCII)));
}
if (readyState != ReadyState.NOT_YET_CONNECTED) {
if (readyState == ReadyState.OPEN) {
@@ -740,7 +741,7 @@
private void write(ByteBuffer buf) {
log.fine("write({}): {}" + " : " + buf.remaining() + " : " +
- (buf.remaining() > 1000 ? "too big to display" : new String(buf.array())));
+ (buf.remaining() > 1000 ? "too big to display" : new String(buf.array(), StandardCharsets.US_ASCII)));
outQueue.add(buf);
wsl.onWriteDemand(this);
--
2.41.0