Fix NPE when deserializing Throwable with ignored JDK fields (e.g. message) (#4326)

Author: JooHyukKim

src/main/java/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.java

@@ -147,6 +147,10 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
                 continue;
             }
             if (_anySetter != null) {
+                // [databind#4316] Since 2.16.2 : at this point throwable should be non-null
+                if (throwable == null) {
+                    throwable = _instantiate(ctxt, hasStringCreator, null);
+                }
                 _anySetter.deserializeAndSet(p, ctxt, throwable, propName);
                 continue;
             }
@@ -194,7 +198,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
     /**
      * Helper method to initialize Throwable
      *
-     * @since 2.17
+     * @since 2.16.2
      */
     private Throwable _instantiate(DeserializationContext ctxt, boolean hasStringCreator, String valueAsString)
         throws IOException

src/test/java/com/fasterxml/jackson/databind/exc/ExceptionWithAnySetter4316Test.java

@@ -4,21 +4,31 @@
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import com.fasterxml.jackson.databind.*;
 
+// [databind#4316] : NPE when deserializing JsonAnySetter in Throwable
 public class ExceptionWithAnySetter4316Test extends BaseMapTest
 {
     static class Problem extends Exception {
         private static final long serialVersionUID = 1L;
+        @JsonInclude(content=JsonInclude.Include.NON_NULL)
+        @JsonAnySetter
+        @JsonAnyGetter
+        Map<String, Object> additionalProperties = new HashMap<>();
+    }
 
+    @JsonIgnoreProperties({ "cause", "stackTrace", "response", "message", "localizedMessage", "suppressed" })
+    static class ProblemWithIgnorals extends Exception {
         @JsonAnySetter
         @JsonAnyGetter
         Map<String, Object> additionalProperties = new HashMap<>();
     }
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
-    // [databind#4316]
     public void testWithAnySetter() throws Exception
     {
         Problem problem = new Problem();
@@ -28,4 +38,53 @@ public void testWithAnySetter() throws Exception
         assertEquals(Collections.singletonMap("key", "value"),
                 result.additionalProperties);
     }
+
+    // Map with ignored props keys specified in @JsonIgnoreProperties
+    public void testWithAnySetterAndIgnoralsPut() throws Exception
+    {
+        // Given
+        ProblemWithIgnorals problem = new ProblemWithIgnorals();
+        problem.additionalProperties.put("key", "value");
+        // Below key-value pairs also ignored from here....
+        problem.additionalProperties.put("cause", "ignored");
+        problem.additionalProperties.put("stackTrace", "ignored");
+        problem.additionalProperties.put("response", "ignored");
+        problem.additionalProperties.put("message", "ignored");
+        problem.additionalProperties.put("localizedMessage", "ignored");
+        problem.additionalProperties.put("suppressed", "ignored");
+
+        // When
+        String json = MAPPER.writeValueAsString(problem);
+        ProblemWithIgnorals result = MAPPER.readValue(json, ProblemWithIgnorals.class);
+
+        // Then
+        assertEquals(Collections.singletonMap("key", "value"),
+            result.additionalProperties);
+    }
+
+    // With ignorals
+    public void testWithAnySetterAndIgnoralSimple() throws Exception
+    {
+        // Given
+        ProblemWithIgnorals problem = new ProblemWithIgnorals();
+        problem.additionalProperties.put("key", "value");
+
+        // When
+        String json = MAPPER.writeValueAsString(problem);
+        ProblemWithIgnorals result = MAPPER.readValue(json, ProblemWithIgnorals.class);
+
+        // Then
+        assertEquals(Collections.singletonMap("key", "value"),
+            result.additionalProperties);
+    }
+
+    // With Include.NON_NULL
+    public void testWithAnySetterButEmptyIncludedFalse() throws Exception
+    {
+        Problem problem = new Problem();
+        problem.additionalProperties.put("exclude", null);
+        String json = MAPPER.writeValueAsString(problem);
+        Problem result = MAPPER.readValue(json, Problem.class);
+        assertEquals(Collections.emptyMap(), result.additionalProperties);
+    }
 }