[java] NonSerializableClass - Fix NPE

pmd · Nov 18, 2022 · 78ac4bc · 78ac4bc
1 parent 7d0f608
commit 78ac4bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonSerializableClassRule.java b/...src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonSerializableClassRule.java
@@ -71,8 +71,8 @@ public Object visit(ASTTypeDeclaration node, Object data) {
         ASTAnyTypeDeclaration anyTypeDeclaration = node.getFirstChildOfType(ASTAnyTypeDeclaration.class);
         for (ASTFieldDeclaration field : anyTypeDeclaration.findDescendantsOfType(ASTFieldDeclaration.class)) {
             for (ASTVariableDeclaratorId varId : field) {
-                if (SERIAL_PERSISTENT_FIELDS_NAME.equals(varId.getName())) {
-                    if (!TypeTestUtil.isA(SERIAL_PERSISTENT_FIELDS_TYPE, field)
+                if (SERIAL_PERSISTENT_FIELDS_NAME.equals(varId.getName()) && varId.getType() != null) {
+                    if (!TypeTestUtil.isA(SERIAL_PERSISTENT_FIELDS_TYPE, varId)
                             || !field.isPrivate()
                             || !field.isStatic()
                             || !field.isFinal()) {
@@ -189,7 +189,7 @@ private Set<String> determinePersistentFields(ASTAnyTypeDeclaration typeDeclarat
             if (fields.isEmpty()) {
                 // field initializer might be a reference to a constant
                 ASTName reference = persistentFieldsDecl.getFirstDescendantOfType(ASTName.class);
-                if (reference.getNameDeclaration() != null) {
+                if (reference != null && reference.getNameDeclaration() != null) {
                     for (ASTLiteral literal : reference.getNameDeclaration().getNode().getParent().findDescendantsOfType(ASTLiteral.class)) {
                         if (literal.isStringLiteral()) {
                             fields.add(StringUtil.removeDoubleQuotes(literal.getImage()));

diff --git a/...test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/NonSerializableClass.xml b/...test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/NonSerializableClass.xml
@@ -349,6 +349,19 @@ class Buzz implements Serializable {
     private FileInputStream stream; // not serializable
     private String name;
 }
+]]></code>
+    </test-code>
+
+    <test-code>
+        <description>NPE with empty array</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import java.io.ObjectStreamField;
+import java.io.Serializable;
+class Buzz implements Serializable {
+    private static final ObjectStreamField[] serialPersistentFields =
+        new ObjectStreamField[0];
+}
 ]]></code>
     </test-code>
 </test-data>