external/java_websocket/UnpackedTarball_java_websocket.mk
| 2
external/java_websocket/patches/0001-cid-1545515-Dm-Dubious-method-used.patch
| 42 ++++++
external/java_websocket/patches/0001-cid-1546264-Dm-Dubious-method-used.patch
| 64 ++++++++++
3 files changed, 108 insertions(+)
New commits:
commit 5046b36374c164d8f0dd2a70b5a250d8536b1ed6
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Oct 1 19:56:01 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Oct 2 09:34:02 2023 +0200
cid#1546494 Dm: Dubious method used
Change-Id: I19a4a9321d544eb6d9d37ffb82bbbbfc4f08661c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157473
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/java_websocket/UnpackedTarball_java_websocket.mk
b/external/java_websocket/UnpackedTarball_java_websocket.mk
index 33691049b792..d468adf65057 100644
--- a/external/java_websocket/UnpackedTarball_java_websocket.mk
+++ b/external/java_websocket/UnpackedTarball_java_websocket.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,java_websocket,\
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 \
+
external/java_websocket/patches/0001-cid-1546264-Dm-Dubious-method-used.patch \
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/java_websocket/patches/0001-cid-1546264-Dm-Dubious-method-used.patch
b/external/java_websocket/patches/0001-cid-1546264-Dm-Dubious-method-used.patch
new file mode 100644
index 000000000000..22730e59f83a
--- /dev/null
+++
b/external/java_websocket/patches/0001-cid-1546264-Dm-Dubious-method-used.patch
@@ -0,0 +1,64 @@
+From 83e8f4ee244e2616032dc0b8b260fda30ca1105b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
+Date: Sun, 1 Oct 2023 19:52:37 +0100
+Subject: [PATCH] cid#1546264 Dm: Dubious method used
+
+and
+
+cid#1546494 Dm: Dubious method used
+---
+ src/main/java/org/java_websocket/SSLSocketChannel2.java | 7 ++++---
+ .../java/org/java_websocket/framing/FramedataImpl1.java | 3 ++-
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java
b/src/main/java/org/java_websocket/SSLSocketChannel2.java
+index c0ea28e..2d3a279 100644
+--- a/src/main/java/org/java_websocket/SSLSocketChannel2.java
++++ b/src/main/java/org/java_websocket/SSLSocketChannel2.java
+@@ -34,6 +34,7 @@
+ import java.nio.channels.SelectableChannel;
+ import java.nio.channels.SelectionKey;
+ import java.nio.channels.SocketChannel;
++import java.nio.charset.StandardCharsets;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.List;
+@@ -257,12 +258,12 @@
+ }
+ }
+ if (inData.remaining() != 0 && log.isLoggable(Level.FINE)) {
+- log.fine(new String(inData.array(), inData.position(),
inData.remaining()));
++ log.fine(new String(inData.array(), inData.position(),
inData.remaining(), StandardCharsets.US_ASCII));
+ }
+ inData.rewind();
+ inData.flip();
+ if (inCrypt.remaining() != 0 && log.isLoggable(Level.FINE)) {
+- log.fine(new String(inCrypt.array(), inCrypt.position(),
inCrypt.remaining()));
++ log.fine(new String(inCrypt.array(), inCrypt.position(),
inCrypt.remaining(), StandardCharsets.US_ASCII));
+ }
+ inCrypt.rewind();
+ inCrypt.flip();
+diff --git a/src/main/java/org/java_websocket/framing/FramedataImpl1.java
b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
+index fc74f7a..6ff1af2 100644
+--- a/src/main/java/org/java_websocket/framing/FramedataImpl1.java
++++ b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
+@@ -26,6 +26,7 @@
+ package org.java_websocket.framing;
+
+ import java.nio.ByteBuffer;
++import java.nio.charset.StandardCharsets;
+ import org.java_websocket.enums.Opcode;
+ import org.java_websocket.exceptions.InvalidDataException;
+ import org.java_websocket.util.ByteBufferUtils;
+@@ -162,7 +163,7 @@ public abstract class FramedataImpl1 implements Framedata {
+ + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payload
length:[pos:" + unmaskedpayload
+ .position() + ", len:" + unmaskedpayload.remaining() + "], payload:"
+ (
+ unmaskedpayload.remaining() > 1000 ? "(too big to display)"
+- : new String(unmaskedpayload.array())) + '}';
++ : new String(unmaskedpayload.array(), StandardCharsets.US_ASCII))
+ '}';
+ }
+
+ /**
+--
+2.41.0
+
commit d4f7f7b22be5dd4d0d924ca0099f9375835149c9
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Oct 1 19:51:41 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Oct 2 09:33:48 2023 +0200
cid#1545515 Dm: Dubious method used
Change-Id: Ife18effd9e477e977e555aea03a78b312e99c6c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157472
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/java_websocket/UnpackedTarball_java_websocket.mk
b/external/java_websocket/UnpackedTarball_java_websocket.mk
index 98c5305f9ce0..33691049b792 100644
--- a/external/java_websocket/UnpackedTarball_java_websocket.mk
+++ b/external/java_websocket/UnpackedTarball_java_websocket.mk
@@ -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:
diff --git
a/external/java_websocket/patches/0001-cid-1545515-Dm-Dubious-method-used.patch
b/external/java_websocket/patches/0001-cid-1545515-Dm-Dubious-method-used.patch
new file mode 100644
index 000000000000..e56780600ad0
--- /dev/null
+++
b/external/java_websocket/patches/0001-cid-1545515-Dm-Dubious-method-used.patch
@@ -0,0 +1,42 @@
+From 695941c8da3e6cefa0553996773a8cf8673bb00e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@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
+
