This is an automated email from the ASF dual-hosted git repository.
afs pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new ccf3c5133f GH-4410: Handle bad replacement syntax
ccf3c5133f is described below
commit ccf3c5133fa41542c985c588a01b86d443dcfbfe
Author: Andy Seaborne <[email protected]>
AuthorDate: Sun Nov 15 09:45:24 2026 +0000
GH-4410: Handle bad replacement syntax
---
.../org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java | 12 ++++++++----
.../apache/jena/sparql/expr/TestSPARQLKeywordFunctions.java | 4 ++++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
index 25319698a0..6d174af3ba 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
@@ -63,6 +63,7 @@ import org.apache.jena.sparql.SystemARQ;
import org.apache.jena.sparql.expr.*;
import org.apache.jena.sparql.util.DateTimeStruct;
import org.apache.jena.sparql.util.XSDNumUtils;
+
/**
* Implementation of XQuery/XPath functions and operators.
* http://www.w3.org/TR/xpath-functions/
@@ -662,11 +663,10 @@ public class XSDFuncOp
// Java: ("", ".*", "x") --> "x" and ("notEmpty", ".*", "x") --> "xx"
// F&O: [err:FORX0003] (in F&O, a global error; SPARQL does not have
global execution errors)
// http://www.w3.org/TR/xpath-functions/#func-replace
- // ARQ
- private static String replaceAll(Matcher matcher, String rep) {
+ private static String replaceAll(Matcher matcher, String replacement) {
+ StringBuilder sb = null;
try {
- StringBuilder sb = null; // Delay until needed
while(matcher.find()) {
if ( sb == null )
sb = new StringBuilder();
@@ -675,7 +675,11 @@ public class XSDFuncOp
if (matcher.start() == matcher.end() )
continue;
}
- matcher.appendReplacement(sb, rep);
+ try {
+ matcher.appendReplacement(sb, replacement);
+ } catch (IllegalArgumentException ex) {
+ throw new ExprEvalException("Bad replacement:
'"+replacement+"'");
+ }
}
if ( sb == null )
return null;
diff --git
a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSPARQLKeywordFunctions.java
b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSPARQLKeywordFunctions.java
index c007965d06..6b7c3c6814 100644
---
a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSPARQLKeywordFunctions.java
+++
b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSPARQLKeywordFunctions.java
@@ -412,6 +412,10 @@ public class TestSPARQLKeywordFunctions
// Long-running regular expressions should be aborted
@Test public void replace32() {
testEvalException("REPLACE('a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,z,y,z',
'^(.*?,){11}P', 'test')"); }
+ // Bad replacement.
+ @Test public void replace33() { testEvalException("REPLACE('abc',
'b', '$')"); }
+ @Test public void replace34() { testEvalException("REPLACE('abc',
'b', '$X')"); }
+
@Test public void sameTerm_01() { test("sameTerm(1,1)",
kwTRUE); }
@Test public void sameTerm_02() { test("sameTerm(1,1.0)",
kwFALSE); }
@Test public void sameTerm_03() { test("sameTerm(1,1e0)",
kwFALSE); }