From e24c2780b6d44c7e5d386e70a1fb3346149ccdc9 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 04 Aug 2026 07:15:33 +0000
Subject: [PATCH] Fix CodeQL note-severity alerts: array logging and uncaught NumberFormatException (#817)
---
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java
index 91a3976..6d09850 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.server.replication.protocol;
@@ -152,7 +153,15 @@
*/
public int nextIntUTF8() throws DataFormatException
{
- return Integer.valueOf(nextString());
+ final String s = nextString();
+ try
+ {
+ return Integer.parseInt(s);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new DataFormatException("Expected an int but read \"" + s + "\"");
+ }
}
/**
@@ -164,7 +173,15 @@
*/
public long nextLongUTF8() throws DataFormatException
{
- return Long.valueOf(nextString());
+ final String s = nextString();
+ try
+ {
+ return Long.parseLong(s);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new DataFormatException("Expected a long but read \"" + s + "\"");
+ }
}
/**
@@ -267,7 +284,7 @@
{
return CSN.valueOf(nextString());
}
- catch (IndexOutOfBoundsException e)
+ catch (LocalizedIllegalArgumentException | IndexOutOfBoundsException e)
{
throw new DataFormatException(e.getMessage());
}
--
Gitblit v1.10.0