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
commit bb000e46d5b57141ab71d3dceba6589ad54281d5 Author: Rob Vesse <[email protected]> AuthorDate: Thu Oct 8 11:24:14 2026 +0100 Apply limits to REPLACE REPLACE uses regular expressions to perform replacements so also impose regular expression limits on its evaluation --- .../main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java | 4 +++- .../java/org/apache/jena/sparql/expr/TestSPARQLKeywordFunctions.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 5ba7d61e21..5d08d03248 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 @@ -647,7 +647,9 @@ public class XSDFuncOp public static NodeValue strReplace(NodeValue nvStr, Pattern pattern, NodeValue nvReplacement) { String n = NodeValueOps.checkAndGetStringLiteral("replace", nvStr).getLiteralLexicalForm(); String rep = NodeValueOps.checkAndGetStringLiteral("replace", nvReplacement).getLiteralLexicalForm(); - String x = replaceAll(pattern.matcher(n), rep); + CharSequence matchSource = RegexEngine.MAX_REGEX_EVALUATION_TIME > 0 ? + new RegexEngine.TimeBoundedCharSequence(n, RegexEngine.MAX_REGEX_EVALUATION_TIME) : n; + String x = replaceAll(pattern.matcher(matchSource), rep); if ( x == null ) // No replacement. return nvStr; 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 529f392260..c007965d06 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 @@ -409,6 +409,9 @@ public class TestSPARQLKeywordFunctions @Test public void replace30() { test("REPLACE('b'@en--ltr, '(a|b)?', 'Z')", "'Z'@en--ltr"); } @Test public void replace31() { test("REPLACE('b'@en--ltr, '(a|b)?', 'Z'@en--ltr)", "'Z'@en--ltr"); } + // 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')"); } + @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); }
