fix BeanUtils#declaredFields null input error, for issue #1286

alibaba · Mar 27, 2023 · 48416e2 · 48416e2
1 parent f508c89
commit 48416e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/util/BeanUtils.java b/core/src/main/java/com/alibaba/fastjson2/util/BeanUtils.java
@@ -277,6 +277,10 @@ public static Field getDeclaredField(Class objectClass, String fieldName) {
      * ignore static fields
      */
     public static void declaredFields(Class objectClass, Consumer<Field> fieldConsumer) {
+        if (objectClass == null || fieldConsumer == null) {
+            return;
+        }
+
         if (TypeUtils.isProxy(objectClass)) {
             Class superclass = objectClass.getSuperclass();
             declaredFields(superclass, fieldConsumer);

diff --git a/core/src/test/java/com/alibaba/fastjson2/util/BeanUtilsTest.java b/core/src/test/java/com/alibaba/fastjson2/util/BeanUtilsTest.java
@@ -263,4 +263,10 @@ public Void getA() {
             return null;
         }
     }
+
+    @Test
+    public void declaredFieldsNull() {
+        BeanUtils.declaredFields(null, o -> {});
+        BeanUtils.declaredFields(Object.class, null);
+    }
 }