8264843: Javac crashes with NullPointerException when finding unencoded XML in <pre> tag

jonathan-gibbons · jonathan-gibbons · commit 0011b52ee81d · 2021-06-17T16:37:35.000Z
Reviewed-by: hannesw
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -383,11 +383,11 @@ public Void visitStartElement(StartElementTree tree, Void ignore) {
                     }
                 }
             }
-        }
 
-        // check for self closing tags, such as <a id="name"/>
-        if (tree.isSelfClosing() && !isSelfClosingAllowed(t)) {
-            env.messages.error(HTML, tree, "dc.tag.self.closing", treeName);
+            // check for self closing tags, such as <a id="name"/>
+            if (tree.isSelfClosing() && !isSelfClosingAllowed(t)) {
+                env.messages.error(HTML, tree, "dc.tag.self.closing", treeName);
+            }
         }
 
         try {
diff --git a/test/langtools/tools/doclint/html/UnknownTagTest.java b/test/langtools/tools/doclint/html/UnknownTagTest.java
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8264843
+ * @summary Javac crashes with NullPointerException when finding unencoded XML in <pre> tag
+ * @library ..
+ * @modules jdk.javadoc/jdk.javadoc.internal.doclint
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs -ref UnknownTagTest.out UnknownTagTest.java
+ */
+
+/**
+ * This is an <unknown> tag.
+ * This is an <unknown a=b> tag with attributes.
+ * This is an <unknown/> self-closing tag.
+ */
+public class UnknownTagTest {
+}
diff --git a/test/langtools/tools/doclint/html/UnknownTagTest.out b/test/langtools/tools/doclint/html/UnknownTagTest.out
@@ -0,0 +1,10 @@
+UnknownTagTest.java:12: error: unknown tag: unknown
+ * This is an <unknown> tag.
+              ^
+UnknownTagTest.java:13: error: unknown tag: unknown
+ * This is an <unknown a=b> tag with attributes.
+              ^
+UnknownTagTest.java:14: error: unknown tag: unknown
+ * This is an <unknown/> self-closing tag.
+              ^
+3 errors

Original file line number	Diff line number	Diff line change
`@@ -383,11 +383,11 @@ public Void visitStartElement(StartElementTree tree, Void ignore) {`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`	`}`
`386`		`- }`
`387`	`386`
`388`		`- // check for self closing tags, such as <a id="name"/>`
`389`		`- if (tree.isSelfClosing() && !isSelfClosingAllowed(t)) {`
`390`		`- env.messages.error(HTML, tree, "dc.tag.self.closing", treeName);`
	`387`	`+ // check for self closing tags, such as <a id="name"/>`
	`388`	`+ if (tree.isSelfClosing() && !isSelfClosingAllowed(t)) {`
	`389`	`+ env.messages.error(HTML, tree, "dc.tag.self.closing", treeName);`
	`390`	`+ }`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`try {`