external/java_websocket/patches/0002-cid-1545284-UR-Uninitialized-read-of-field-in-constr.patch
| 2 +-
ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6ce4d0091f1e55080f5e9e9c54f27747d1ef700f
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 29 12:43:38 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Oct 2 17:30:31 2023 +0200
drop use of urp: followed by newline of space
and just use space
Change-Id: Ib2765855971691aa72643d3e3d5c06cdcbd634ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157435
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git
a/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
b/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
index cdffa43faf6c..87a8604c7b7d 100644
--- a/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
+++ b/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
@@ -282,7 +282,7 @@ public class WebsocketConnection extends WebSocketClient
implements XConnection,
boolean hasType = false;
int i;
for (i = 0; i < prefixedMessageBytes.length - 1; i++) {
- if (prefixedMessageBytes[i] == ':' && (prefixedMessageBytes[i+1]
== ' ' || prefixedMessageBytes[i+1] == '\n')) {
+ if (prefixedMessageBytes[i] == ':' && prefixedMessageBytes[i+1] ==
' ') {
hasType = true;
break; // The type ends with ": ", so if we find this
sequence we found the end of our type
}
@@ -290,7 +290,7 @@ public class WebsocketConnection extends WebSocketClient
implements XConnection,
}
if(!hasType) {
- notifyListeners_error(new com.sun.star.uno.Exception(new
ProtocolException(String.format("Received URP/WS message (%s) without a type
specifier. Binary messages must be proceeded by 'urp: ' or 'urp:\\n'",
message))));
+ notifyListeners_error(new com.sun.star.uno.Exception(new
ProtocolException(String.format("Received URP/WS message (%s) without a type
specifier. Binary messages must be proceeded by 'urp: '", message))));
return;
}
commit 9e6454142cbdf0df9a70060363157b06c5115a96
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Oct 2 09:09:10 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Oct 2 17:30:17 2023 +0200
cid#1545284 fix UR: Uninitialized read of field in constructor
Change-Id: I6d2449f86c4d5745c6068b5df4bf362198cabd18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157479
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git
a/external/java_websocket/patches/0002-cid-1545284-UR-Uninitialized-read-of-field-in-constr.patch
b/external/java_websocket/patches/0002-cid-1545284-UR-Uninitialized-read-of-field-in-constr.patch
index a7d67172d6bc..61415c932e11 100644
---
a/external/java_websocket/patches/0002-cid-1545284-UR-Uninitialized-read-of-field-in-constr.patch
+++
b/external/java_websocket/patches/0002-cid-1545284-UR-Uninitialized-read-of-field-in-constr.patch
@@ -17,7 +17,7 @@ index b402450..760f643 100644
public SSLSocketChannel(SocketChannel inputSocketChannel, SSLEngine
inputEngine,
ExecutorService inputExecutor, SelectionKey key) throws IOException {
- if (inputSocketChannel == null || inputEngine == null || executor ==
inputExecutor) {
-+ if (inputSocketChannel == null || inputEngine == null || executor ==
null) {
++ if (inputSocketChannel == null || inputEngine == null || inputExecutor ==
null) {
throw new IllegalArgumentException("parameter must not be null");
}
