|
 |
59eab7 |
From 34af291680f7554b16412205e7b47aa2f829b29c Mon Sep 17 00:00:00 2001
|
|
|
59eab7 |
From: Anton Kozlov <akozlov@azul.com>
|
|
|
59eab7 |
Date: Fri, 15 Apr 2022 14:07:52 +0300
|
|
|
59eab7 |
Subject: [PATCH] 8284920: Incorrect Token type causes XPath expression to
|
|
|
59eab7 |
return empty result
|
|
|
59eab7 |
|
|
|
59eab7 |
Backport-of: 0d3aea2f11df585b491ae5c07de9f66679601d58
|
|
|
59eab7 |
|
|
|
59eab7 |
Reviewed-by:
|
|
|
59eab7 |
---
|
|
|
59eab7 |
.../com/sun/org/apache/xpath/internal/compiler/Lexer.java | 4 ++--
|
|
|
59eab7 |
.../com/sun/org/apache/xpath/internal/compiler/Token.java | 4 ++--
|
|
|
59eab7 |
.../org/apache/xpath/internal/compiler/XPathParser.java | 8 ++++----
|
|
|
59eab7 |
3 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
59eab7 |
|
|
|
59eab7 |
diff --git openjdk.orig/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java openjdk/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java
|
|
|
59eab7 |
index b7b3f419eb2..41b58da8e99 100644
|
|
|
59eab7 |
--- openjdk.orig/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java
|
|
|
59eab7 |
+++ openjdk/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java
|
|
|
59eab7 |
@@ -360,7 +360,7 @@ class Lexer
|
|
|
59eab7 |
|
|
|
59eab7 |
addToTokenQueue(pat.substring(i, i + 1));
|
|
|
59eab7 |
break;
|
|
|
59eab7 |
- case Token.COLON :
|
|
|
59eab7 |
+ case Token.COLON_CHAR:
|
|
|
59eab7 |
if (i>0)
|
|
|
59eab7 |
{
|
|
|
59eab7 |
if (posOfNSSep == (i - 1))
|
|
|
59eab7 |
@@ -615,7 +615,7 @@ class Lexer
|
|
|
59eab7 |
resetTokenMark(tokPos + 1);
|
|
|
59eab7 |
}
|
|
|
59eab7 |
|
|
|
59eab7 |
- if (m_processor.lookahead(Token.COLON, 1))
|
|
|
59eab7 |
+ if (m_processor.lookahead(Token.COLON_CHAR, 1))
|
|
|
59eab7 |
{
|
|
|
59eab7 |
tokPos += 2;
|
|
|
59eab7 |
}
|
|
|
59eab7 |
diff --git openjdk.orig/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Token.java openjdk/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Token.java
|
|
|
59eab7 |
index 8c4fee146c6..7bce14e5770 100644
|
|
|
59eab7 |
--- openjdk.orig/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Token.java
|
|
|
59eab7 |
+++ openjdk/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Token.java
|
|
|
59eab7 |
@@ -45,10 +45,9 @@ public final class Token {
|
|
|
59eab7 |
static final char LPAREN = '(';
|
|
|
59eab7 |
static final char RPAREN = ')';
|
|
|
59eab7 |
static final char COMMA = ',';
|
|
|
59eab7 |
- static final char DOT = '.';
|
|
|
59eab7 |
static final char AT = '@';
|
|
|
59eab7 |
static final char US = '_';
|
|
|
59eab7 |
- static final char COLON = ':';
|
|
|
59eab7 |
+ static final char COLON_CHAR = ':';
|
|
|
59eab7 |
static final char SQ = '\'';
|
|
|
59eab7 |
static final char DQ = '"';
|
|
|
59eab7 |
static final char DOLLAR = '$';
|
|
|
59eab7 |
@@ -58,6 +57,7 @@ public final class Token {
|
|
|
59eab7 |
static final String DIV = "div";
|
|
|
59eab7 |
static final String MOD = "mod";
|
|
|
59eab7 |
static final String QUO = "quo";
|
|
|
59eab7 |
+ static final String DOT = ".";
|
|
|
59eab7 |
static final String DDOT = "..";
|
|
|
59eab7 |
static final String DCOLON = "::";
|
|
|
59eab7 |
static final String ATTR = "attribute";
|
|
|
59eab7 |
diff --git openjdk.orig/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java openjdk/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
|
|
|
59eab7 |
index c3f9e1494be..22192fd06f6 100644
|
|
|
59eab7 |
--- openjdk.orig/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
|
|
|
59eab7 |
+++ openjdk/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
|
|
|
59eab7 |
@@ -1413,7 +1413,7 @@ public class XPathParser
|
|
|
59eab7 |
|
|
|
59eab7 |
matchFound = true;
|
|
|
59eab7 |
}
|
|
|
59eab7 |
- else if (lookahead(Token.LPAREN, 1) || (lookahead(Token.COLON, 1) && lookahead(Token.LPAREN, 3)))
|
|
|
59eab7 |
+ else if (lookahead(Token.LPAREN, 1) || (lookahead(Token.COLON_CHAR, 1) && lookahead(Token.LPAREN, 3)))
|
|
|
59eab7 |
{
|
|
|
59eab7 |
matchFound = FunctionCall();
|
|
|
59eab7 |
}
|
|
|
59eab7 |
@@ -1457,7 +1457,7 @@ public class XPathParser
|
|
|
59eab7 |
|
|
|
59eab7 |
int opPos = m_ops.getOp(OpMap.MAPINDEX_LENGTH);
|
|
|
59eab7 |
|
|
|
59eab7 |
- if (lookahead(Token.COLON, 1))
|
|
|
59eab7 |
+ if (lookahead(Token.COLON_CHAR, 1))
|
|
|
59eab7 |
{
|
|
|
59eab7 |
appendOp(4, OpCodes.OP_EXTFUNCTION);
|
|
|
59eab7 |
|
|
|
59eab7 |
@@ -1841,7 +1841,7 @@ public class XPathParser
|
|
|
59eab7 |
m_ops.setOp(m_ops.getOp(OpMap.MAPINDEX_LENGTH), OpCodes.NODENAME);
|
|
|
59eab7 |
m_ops.setOp(OpMap.MAPINDEX_LENGTH, m_ops.getOp(OpMap.MAPINDEX_LENGTH) + 1);
|
|
|
59eab7 |
|
|
|
59eab7 |
- if (lookahead(Token.COLON, 1))
|
|
|
59eab7 |
+ if (lookahead(Token.COLON_CHAR, 1))
|
|
|
59eab7 |
{
|
|
|
59eab7 |
if (tokenIs(Token.STAR))
|
|
|
59eab7 |
{
|
|
|
59eab7 |
@@ -1944,7 +1944,7 @@ public class XPathParser
|
|
|
59eab7 |
protected void QName() throws TransformerException
|
|
|
59eab7 |
{
|
|
|
59eab7 |
// Namespace
|
|
|
59eab7 |
- if(lookahead(Token.COLON, 1))
|
|
|
59eab7 |
+ if(lookahead(Token.COLON_CHAR, 1))
|
|
|
59eab7 |
{
|
|
|
59eab7 |
m_ops.setOp(m_ops.getOp(OpMap.MAPINDEX_LENGTH), m_queueMark - 1);
|
|
|
59eab7 |
m_ops.setOp(OpMap.MAPINDEX_LENGTH, m_ops.getOp(OpMap.MAPINDEX_LENGTH) + 1);
|
|
|
59eab7 |
--
|
|
|
59eab7 |
2.34.1
|
|
|
59eab7 |
|