Merge branch '2.17'

FasterXML · Jan 8, 2024 · 6b755ab · 6b755ab
2 parents 33e0727 + 041d619
commit 6b755ab
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ion/src/main/java/tools/jackson/dataformat/ion/IonParser.java b/ion/src/main/java/tools/jackson/dataformat/ion/IonParser.java
@@ -515,8 +515,11 @@ public Object getEmbeddedObject() throws JacksonException {
         if (_currToken == JsonToken.VALUE_EMBEDDED_OBJECT) {
             switch (_reader.getType()) {
             case TIMESTAMP:
-                try {
+                try { 
                     return _reader.timestampValue();
+                } catch (NullPointerException e) {
+                    // 07-Jan-2024, tatu: OSS-Fuzz suggests this occurs too so
+                    return _reportCorruptContent(e);
                 } catch (IllegalArgumentException e) {
                     throw _constructReadException(String.format(
                             "Invalid embedded TIMESTAMP value, problem: %s", e.getMessage()),