Skip to content

use correct error key for out-of-range hex escape in RegexParser #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aizu-m wants to merge 1 commit into
base: trunk
Choose a base branch
from
+15 −1
Open

use correct error key for out-of-range hex escape in RegexParser #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/apache/xmlbeans/impl/regex/RegexParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@ int decodeEscaped() throws ParseException {
if (this.read() != T_CHAR || (v2 = hexChar(this.chardata)) < 0)
throw ex("parser.descape.1", this.offset - 1);
uv2 = uv2 * 16 + v2;
if (uv2 > Token.UTF16_MAX) throw ex("parser.descappe.4", this.offset - 1);
if (uv2 > Token.UTF16_MAX) throw ex("parser.descape.4", this.offset - 1);
c = uv2;
break;
}
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/misc/checkin/RegularExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,20 @@ void testLookbehindRangeAtInputEnd() {
assertFalse(new RegularExpression("x(?<=[a-c])").matches("xc"));
}

@Test
void testHexEscapeOverflowErrorKey() {
// a \v escape (6 hex digits) whose value is above U+10FFFF was reported with
// the error key "parser.descappe.4", which is not in the message bundle, so
// ResourceBundle.getString threw MissingResourceException instead of the
// ParseException callers expect. The sibling \x{...} path already reports the
// same condition cleanly via "parser.descape.4".
assertThrows(ParseException.class, () -> new RegularExpression("\\v110000"));
assertThrows(ParseException.class, () -> new RegularExpression("\\vFFFFFF"));
assertThrows(ParseException.class, () -> new RegularExpression("\\x{110000}"));
// the top of the Unicode range is still valid and must parse
new RegularExpression("\\v10FFFF");
}

@Test
void testQuantifierOverflow() {
// a {min,max} count larger than Integer.MAX_VALUE overflowed the int
Expand Down