From ff1c33d7c328cd9d6cc31f2a098cd38bbbe16bef Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Tue, 2 Jan 2024 12:40:41 -0800 Subject: [PATCH] Add NPE check for dealing with another OSS-Fuzz found edge case --- .../com/fasterxml/jackson/dataformat/ion/IonParser.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java index cb85ec0bc..da91a35bb 100644 --- a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java +++ b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java @@ -509,7 +509,12 @@ public Object getEmbeddedObject() throws IOException { } case BLOB: case CLOB: - return _reader.newBytes(); + try { + return _reader.newBytes(); + } catch (NullPointerException e) { + // 02-Jan-2024, tatu: OSS-Fuzz#65479 points to NPE ^^^ + return _reportCorruptContent(e); + } // What about CLOB? default: }