Check attributes not null

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=63259
jhy · Oct 18, 2023 · 4864af4 · 4864af4
1 parent d61ec5a
commit 4864af4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/org/jsoup/parser/HtmlTreeBuilderState.java b/src/main/java/org/jsoup/parser/HtmlTreeBuilderState.java
@@ -1775,9 +1775,9 @@ else if (HtmlTreeBuilderState.isWhitespace(c))
                     if (StringUtil.in(start.normalName, InForeignToHtml))
                         return processAsHtml(t, tb);
                     if (start.normalName.equals("font") && (
-                        start.attributes.hasKeyIgnoreCase("color")
-                            || start.attributes.hasKeyIgnoreCase("face")
-                            || start.attributes.hasKeyIgnoreCase("size")))
+                        start.hasAttributeIgnoreCase("color")
+                            || start.hasAttributeIgnoreCase("face")
+                            || start.hasAttributeIgnoreCase("size")))
                         return processAsHtml(t, tb);
 
                     // Any other start:

diff --git a/src/main/java/org/jsoup/parser/Token.java b/src/main/java/org/jsoup/parser/Token.java
@@ -172,10 +172,15 @@ final boolean hasAttributes() {
             return attributes != null;
         }
 
+        /** Case-sensitive check */
         final boolean hasAttribute(String key) {
             return attributes != null && attributes.hasKey(key);
         }
 
+        final boolean hasAttributeIgnoreCase(String key) {
+            return attributes != null && attributes.hasKeyIgnoreCase(key);
+        }
+
         final void finaliseTag() {
             // finalises for emit
             if (hasAttrName) {

diff --git a/src/test/resources/fuzztests/63259.html.gz b/src/test/resources/fuzztests/63259.html.gz