Skip to content

Fix missing null checks in uses of consumeIdentOrUrlOrFunctions #266

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

Merged
merged 2 commits into from
Jun 8, 2022
Merged

Fix missing null checks in uses of consumeIdentOrUrlOrFunctions #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b58cfe8
Fix missing null checks in uses of consumeIdentOrUrlOrFunctions
mikesamuel Jun 8, 2022
351ee9b
Merge branch 'main' into progress-in-css-tokens-loop
mikesamuel Jun 8, 2022
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
32 changes: 27 additions & 5 deletions src/main/java/org/owasp/html/CssTokens.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ void lex() {
char ch = css.charAt(pos);
int startOfToken = pos;
int startOfOutputToken = sb.length();
final TokenType type;
TokenType type;
switch (ch) {
case '\t': case '\n': case '\f': case '\r': case ' ': case '\ufeff':
consumeIgnorable();
Expand Down Expand Up @@ -514,6 +514,7 @@ void lex() {
type = TokenType.UNICODE_RANGE;
} else {
type = consumeIdentOrUrlOrFunction();
assert type != null;
}
break;
case '0': case '1': case '2': case '3': case '4':
Expand All @@ -533,7 +534,14 @@ && isDecimal(css.charAt(pos + 2)))) {
if (consumeIgnorable()) { // -->
type = TokenType.WHITESPACE;
} else {
type = consumeIdentOrUrlOrFunction();
TokenType identType = consumeIdentOrUrlOrFunction();
if (identType == null) {
breakOutput();
consumeDelim(ch);
type = TokenType.DELIM;
} else {
type = identType;
}
}
} else if (isIdentPart(lookahead)) {
// treat ".<IDENT>" as one token.
Expand Down Expand Up @@ -589,9 +597,17 @@ && isDecimal(css.charAt(pos + 2)))) {
}
break;
}
case '_':
type = consumeIdentOrUrlOrFunction();
case '_': {
TokenType identType = consumeIdentOrUrlOrFunction();
if (identType != null) {
type = identType;
} else {
++pos; // drop
breakOutput();
type = TokenType.WHITESPACE;
}
break;
}
case '\\': {
// Optimistically parse as an ident.
TokenType identType = consumeIdentOrUrlOrFunction();
Expand Down Expand Up @@ -624,7 +640,13 @@ && isDecimal(css.charAt(pos + 2)))) {
type = TokenType.WHITESPACE;
}
}
assert pos > startOfToken
// Make progress even in the face of errors above.
if (type == null && pos == startOfToken) {
type = TokenType.WHITESPACE;
breakOutput();
++pos;
}
assert type != null && pos > startOfToken
: "empty token at " + pos + ", ch0=" + css.charAt(startOfToken)
+ ":U+" + Integer.toHexString(css.charAt(startOfToken));
int endOfOutputToken = sb.length();
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/org/owasp/html/HtmlSanitizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,13 @@ public static final void testIssue254SemicolonlessNamedCharactersInUrls() {
assertEquals(want, sanitize(input));
}

@Test
public static final void testStylingCornerCase() {
String input = "<a style=\\006-\\000038";
String want = "";
assertEquals(want, sanitize(input));
}

private static String sanitize(@Nullable String html) {
StringBuilder sb = new StringBuilder();
HtmlStreamRenderer renderer = HtmlStreamRenderer.create(
Expand Down