Skip to content

Commit 3fd2dfe

Browse files
authored
Merge pull request #4477 from nab-iha3/unicode-escape-hex-overflow
handle oversized hex in unicode brace-escapes as syntax error
2 parents d86a873 + 24a6b57 commit 3fd2dfe

5 files changed

Lines changed: 34 additions & 1 deletion

File tree

‎src/main/java/graphql/parser/UnicodeUtil.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,15 @@ public static int parseAndWriteUnicode(I18n i18n, StringBuilder writer, String s
4545
i = continueIndex + 2;
4646
int trailingStartIndex = isBracedEscape(string, i) ? i + 2 : i + 1;
4747
int trailingEndIndexExclusive = getEndIndexExclusive(i18n, string, i, sourceLocation);
48-
int trailingCodePoint = Integer.parseInt(string, trailingStartIndex, trailingEndIndexExclusive, 16);
4948
continueIndex = isBracedEscape(string, i) ? trailingEndIndexExclusive : trailingEndIndexExclusive - 1;
5049

50+
int trailingCodePoint;
51+
try {
52+
trailingCodePoint = Integer.parseInt(string, trailingStartIndex, trailingEndIndexExclusive, 16);
53+
} catch (NumberFormatException e) {
54+
throw new InvalidUnicodeSyntaxException(i18n, "InvalidUnicode.invalidHexString", sourceLocation, offendingToken(string, i, continueIndex));
55+
}
56+
5157
if (isTrailingSurrogateValue(trailingCodePoint)) {
5258
writeCodePoint(writer, codePoint);
5359
writeCodePoint(writer, trailingCodePoint);

‎src/main/resources/i18n/Parsing.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ InvalidUnicode.trailingLeadingSurrogate=Invalid unicode encountered. Trailing su
2828
InvalidUnicode.leadingTrailingSurrogate=Invalid unicode encountered. Leading surrogate must be followed by a trailing surrogate. Offending token ''{0}'' at line {1} column {2}
2929
InvalidUnicode.invalidCodePoint=Invalid unicode encountered. Not a valid code point. Offending token ''{0}'' at line {1} column {2}
3030
InvalidUnicode.incorrectEscape=Invalid unicode encountered. Incorrectly formatted escape sequence. Offending token ''{0}'' at line {1} column {2}
31+
InvalidUnicode.invalidHexString=Invalid unicode encountered. Not a valid hex digits string. Offending token ''{0}'' at line {1} column {2}

‎src/main/resources/i18n/Parsing_de.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ InvalidUnicode.trailingLeadingSurrogate=Ungültiger Unicode gefunden. Trailing s
2828
InvalidUnicode.leadingTrailingSurrogate=Ungültiger Unicode gefunden. Auf ein leading surrogate muss ein trailing surrogate folgen. Ungültiges Token ''{0}'' in Zeile {1} Spalte {2}
2929
InvalidUnicode.invalidCodePoint=Ungültiger Unicode gefunden. Kein gültiger code point. Ungültiges Token ''{0}'' in Zeile {1} Spalte {2}
3030
InvalidUnicode.incorrectEscape=Ungültiger Unicode gefunden. Falsch formatierte Escape-Sequenz. Ungültiges Token ''{0}'' in Zeile {1} Spalte {2}
31+
InvalidUnicode.invalidHexString=Ungültiger Unicode gefunden. Keine gültige Hexadezimalzeichenfolge. Ungültiges Token ''{0}'' in Zeile {1} Spalte {2}

‎src/main/resources/i18n/Parsing_nl.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ InvalidUnicode.trailingLeadingSurrogate=Ongeldige Unicode tegengekomen. Trailing
2727
InvalidUnicode.leadingTrailingSurrogate=Ongeldige Unicode tegengekomen. Leading surrogate moet voorafgaan aan een trailing surrogate. Ongeldige token ''{0}'' op lijn {1} kolom {2}
2828
InvalidUnicode.invalidCodePoint=Ongeldige Unicode tegengekomen. Ongeldig codepunt. Ongeldige token ''{0}'' op lijn {1} kolom {2}
2929
InvalidUnicode.incorrectEscape=Ongeldige Unicode tegengekomen. Ongeldige geformatteerde escape-sequentie. Ongeldige token ''{0}'' op lijn {1} kolom {2}}
30+
InvalidUnicode.invalidHexString=Ongeldige Unicode tegengekomen. Geen geldige hexadecimale tekenreeks. Ongeldige token ''{0}'' op lijn {1} kolom {2}

‎src/test/groovy/graphql/parser/StringValueParsingUnicodeTest.groovy‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,28 @@ class StringValueParsingUnicodeTest extends Specification {
257257
InvalidSyntaxException e = thrown(InvalidSyntaxException)
258258
e.message == "Invalid unicode encountered. Not a valid code point. Offending token '\\u{fffffff}' at line -1 column -1"
259259
}
260+
261+
def "invalid unicode code point - braced hex value overflows int"() {
262+
given:
263+
def input = '''"\\u{fffffffff}"'''
264+
265+
when:
266+
StringValueParsing.parseSingleQuotedString(i18n, input,sourceLocation)
267+
268+
then:
269+
InvalidSyntaxException e = thrown(InvalidSyntaxException)
270+
e.message == "Invalid unicode encountered. Not a valid hex digits string. Offending token '\\u{fffffffff}' at line -1 column -1"
271+
}
272+
273+
def "invalid surrogate pair - trailing braced hex value overflows int"() {
274+
given:
275+
def input = '''"\\uD83D\\u{fffffffff}"'''
276+
277+
when:
278+
StringValueParsing.parseSingleQuotedString(i18n, input,sourceLocation)
279+
280+
then:
281+
InvalidSyntaxException e = thrown(InvalidSyntaxException)
282+
e.message == "Invalid unicode encountered. Not a valid hex digits string. Offending token '\\u{fffffffff}' at line -1 column -1"
283+
}
260284
}

0 commit comments

Comments
 (0)