Merge branch '2.13' into 2.14

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
+2.14.3 (not yet released)
+
+#3784: `PrimitiveArrayDeserializers$ByteDeser.deserialize` ignores
+  `DeserializationProblemHandler` for invalid Base64 content
+
 2.14.2 (28-Jan-2023)
 
 #1751: `@JsonTypeInfo` does not work if the Type Id is an Integer value

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

@@ -10,6 +10,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamReadException;
+
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
@@ -467,7 +468,7 @@ public byte[] deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
             if (t == JsonToken.VALUE_STRING) {
                 try {
                     return p.getBinaryValue(ctxt.getBase64Variant());
-                } catch (StreamReadException e) {
+                } catch (StreamReadException | DatabindException e) {
                     // 25-Nov-2016, tatu: related to [databind#1425], try to convert
                     //   to a more usable one, as it's not really a JSON-level parse
                     //   exception, but rather binding from JSON String into base64 decoded

src/test/java/com/fasterxml/jackson/databind/deser/filter/ProblemHandlerTest.java

@@ -271,6 +271,22 @@ public void testWeirdStringHandling() throws Exception
         assertNull(result2);
     }
 
+    // [databind#3784]: Base64 decoding
+    public void testWeirdStringForBase64() throws Exception
+    {
+        ObjectMapper mapper = newJsonMapper()
+                .addHandler(new WeirdStringHandler(new byte[0]))
+                ;
+        byte[] binary = mapper.readValue(q("foobar"), byte[].class);
+        assertNotNull(binary);
+        assertEquals(0, binary.length);
+
+        JsonNode tree = mapper.readTree(q("foobar"));
+        binary = mapper.treeToValue(tree, byte[].class);
+        assertNotNull(binary);
+        assertEquals(0, binary.length);
+    }
+
     public void testInvalidTypeId() throws Exception
     {
         ObjectMapper mapper = newJsonMapper()