external/java_websocket/patches/0001-cid-1546264-Dm-Dubious-method-used.patch

   1 From 83e8f4ee244e2616032dc0b8b260fda30ca1105b Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
   3 Date: Sun, 1 Oct 2023 19:52:37 +0100
   4 Subject: [PATCH] cid#1546264 Dm: Dubious method used
   5
   6 and
   7
   8 cid#1546494 Dm: Dubious method used
   9 ---
  10  src/main/java/org/java_websocket/SSLSocketChannel2.java    | 7 ++++---
  11  .../java/org/java_websocket/framing/FramedataImpl1.java    | 3 ++-
  12  2 files changed, 6 insertions(+), 4 deletions(-)
  13
  14 diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
  15 index c0ea28e..2d3a279 100644
  16 --- a/src/main/java/org/java_websocket/SSLSocketChannel2.java
  17 +++ b/src/main/java/org/java_websocket/SSLSocketChannel2.java
  18 @@ -34,6 +34,7 @@
  19  import java.nio.channels.SelectableChannel;
  20  import java.nio.channels.SelectionKey;
  21  import java.nio.channels.SocketChannel;
  22 +import java.nio.charset.StandardCharsets;
  23  import java.util.ArrayList;
  24  import java.util.Iterator;
  25  import java.util.List;
  26 @@ -257,12 +258,12 @@
  27        }
  28      }
  29      if (inData.remaining() != 0 && log.isLoggable(Level.FINE)) {
  30 -      log.fine(new String(inData.array(), inData.position(), inData.remaining()));
  31 +      log.fine(new String(inData.array(), inData.position(), inData.remaining(), StandardCharsets.US_ASCII));
  32      }
  33      inData.rewind();
  34      inData.flip();
  35      if (inCrypt.remaining() != 0 && log.isLoggable(Level.FINE)) {
  36 -      log.fine(new String(inCrypt.array(), inCrypt.position(), inCrypt.remaining()));
  37 +      log.fine(new String(inCrypt.array(), inCrypt.position(), inCrypt.remaining(), StandardCharsets.US_ASCII));
  38      }
  39      inCrypt.rewind();
  40      inCrypt.flip();
  41 diff --git a/src/main/java/org/java_websocket/framing/FramedataImpl1.java b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
  42 index fc74f7a..6ff1af2 100644
  43 --- a/src/main/java/org/java_websocket/framing/FramedataImpl1.java
  44 +++ b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
  45 @@ -26,6 +26,7 @@
  46  package org.java_websocket.framing;
  47
  48  import java.nio.ByteBuffer;
  49 +import java.nio.charset.StandardCharsets;
  50  import org.java_websocket.enums.Opcode;
  51  import org.java_websocket.exceptions.InvalidDataException;
  52  import org.java_websocket.util.ByteBufferUtils;
  53 @@ -162,7 +163,7 @@ public abstract class FramedataImpl1 implements Framedata {
  54          + ", rsv2:" + isRSV2() + ", rsv3:" + isRSV3() + ", payload length:[pos:" + unmaskedpayload
  55          .position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + (
  56          unmaskedpayload.remaining() > 1000 ? "(too big to display)"
  57 -            : new String(unmaskedpayload.array())) + '}';
  58 +            : new String(unmaskedpayload.array(), StandardCharsets.US_ASCII)) + '}';
  59    }
  60
  61    /**
  62 --
  63 2.41.0
  64