From 18fd136fa155befe4e43f294c5629c178d5e6414 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Wed, 21 Oct 2026 08:52:49 +0000
Subject: [PATCH] GHSA-jr68-5c58-j463 DSMLv2 gateway changes XML data binding of other applications in the same JVM

---
 opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLSearchOperation.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLSearchOperation.java b/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLSearchOperation.java
index 4df2a4c..7e00e07 100644
--- a/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2009 Sun Microsystems, Inc.
  * Portions Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.dsml.protocol;
 
@@ -111,7 +112,7 @@
     throws IOException
   {
     return LDAPFilter.createApproximateFilter(ava.getName(),
-        ByteStringUtility.convertValue(ava.getValue()));
+        ByteStringUtility.convertRequiredValue(ava.getValue()));
   }
 
 
@@ -130,7 +131,7 @@
     throws IOException
   {
     return LDAPFilter.createEqualityFilter(ava.getName(),
-        ByteStringUtility.convertValue(ava.getValue()));
+        ByteStringUtility.convertRequiredValue(ava.getValue()));
   }
 
 
@@ -149,7 +150,7 @@
     throws IOException
   {
     return LDAPFilter.createExtensibleFilter(mra.getMatchingRule(), mra
-        .getName(), ByteStringUtility.convertValue(mra.getValue()),
+        .getName(), ByteStringUtility.convertRequiredValue(mra.getValue()),
         mra.isDnAttributes());
   }
 
@@ -171,7 +172,7 @@
     throws IOException
   {
     return LDAPFilter.createGreaterOrEqualFilter(ava.getName(),
-        ByteStringUtility.convertValue(ava.getValue()));
+        ByteStringUtility.convertRequiredValue(ava.getValue()));
   }
 
 
@@ -191,7 +192,7 @@
     throws IOException
   {
     return LDAPFilter.createLessOrEqualFilter(ava.getName(),
-        ByteStringUtility.convertValue(ava.getValue()));
+        ByteStringUtility.convertRequiredValue(ava.getValue()));
   }
 
 
@@ -282,7 +283,7 @@
 
     for (Object o : anyo)
     {
-      subAnyElements.add(ByteStringUtility.convertValue(o));
+      subAnyElements.add(ByteStringUtility.convertRequiredValue(o));
     }
     if(sf.getInitial() == null && subAnyElements.isEmpty()
             && sf.getFinal()==null)
@@ -292,10 +293,10 @@
     }
     return LDAPFilter.createSubstringFilter(sf.getName(),
         sf.getInitial() == null ? null : ByteStringUtility
-            .convertValue(sf.getInitial()),
+            .convertRequiredValue(sf.getInitial()),
         subAnyElements,
         sf.getFinal() == null ? null : ByteStringUtility
-            .convertValue(sf.getFinal()));
+            .convertRequiredValue(sf.getFinal()));
   }
 
 

--
Gitblit v1.10.0