Fix #4145 by adding null checks

FasterXML · Oct 7, 2023 · c95efce · c95efce
1 parent 254eb26
commit c95efce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -818,6 +818,9 @@ Freddy Boucher (freddyboucher@github)
 Ondrej Zizka (OndraZizk@github)
   * Reported #1999: "Duplicate property" issue should mention which class it complains about
    (2.9.6)
+  * Repoted #4145: NPE when transforming a tree to a model class object,
+    at `ArrayNode.elements()`
+   (2.16.0)
 
 Jakub Skierbiszewski (jskierbi@github)
   * Reported, contributed fix for #2001: Deserialization issue with `@JsonIgnore` and

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -86,6 +86,8 @@ Project: jackson-databind
   wrt argument
 #4122: Do not resolve wildcards if upper bound is too non-specific
  (contributed by @yawkat)
+#4145: NPE when transforming a tree to a model class object, at `ArrayNode.elements()`
+ (reported by Ondrej Z)
 
 2.15.3 (not yet released)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java b/src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java
@@ -44,7 +44,8 @@ public ArrayNode(JsonNodeFactory nf, int capacity) {
      */
     public ArrayNode(JsonNodeFactory nf, List<JsonNode> children) {
         super(nf);
-        _children = children;
+        _children = Objects.requireNonNull(children,
+                "Must not pass `null` for 'children' argument");
     }
 
     @Override

diff --git a/src/main/java/com/fasterxml/jackson/databind/node/ObjectNode.java b/src/main/java/com/fasterxml/jackson/databind/node/ObjectNode.java
@@ -35,9 +35,10 @@ public ObjectNode(JsonNodeFactory nc) {
     /**
      * @since 2.4
      */
-    public ObjectNode(JsonNodeFactory nc, Map<String, JsonNode> kids) {
+    public ObjectNode(JsonNodeFactory nc, Map<String, JsonNode> children) {
         super(nc);
-        _children = kids;
+        _children = Objects.requireNonNull(children,
+                "Must not pass `null` for 'children' argument");
     }
 
     @Override