diff --git a/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java b/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java index e67df115..f805795c 100644 --- a/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java +++ b/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java @@ -1013,10 +1013,18 @@ public Object getNumberValueDeferred() throws IOException { // due to refactoring. So let's try to cobble something together if (_currToken == JsonToken.VALUE_NUMBER_INT) { - // For integrals, use eager decoding for all ints, longs (and - // some cheaper BigIntegers) - if (_cleanedTextValue.length() <= 18) { - return getNumberValue(); + // We might already have suitable value? + if ((_numTypesValid & NR_INT) != 0) { + return _numberInt; + } + if ((_numTypesValid & NR_LONG) != 0) { + return _numberLong; + } + if ((_numTypesValid & NR_BIGINT) != 0) { + return _getBigInteger(); + } + if (_cleanedTextValue == null) { + _reportError("Internal number decoding error: `_cleanedTextValue` null when nothing decoded for `JsonToken.VALUE_NUMBER_INT`"); } return _cleanedTextValue; } diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/FuzzYAMLReadTest.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/FuzzYAMLReadTest.java index dfc55112..ec677f32 100644 --- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/FuzzYAMLReadTest.java +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/FuzzYAMLReadTest.java @@ -1,5 +1,7 @@ package com.fasterxml.jackson.dataformat.yaml.deser; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JacksonException; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.JsonNode; @@ -85,4 +87,28 @@ public void testNumberDecoding61823() throws Exception verifyException(e, "Invalid number"); } } + + // [dataformats-text#445]: NPE + static class ModelContainer445 + { + public String string; + + @JsonCreator + public ModelContainer445(@JsonProperty(value = "string") String string) { + this.string = string; + } + } + + // [dataformats-text#445]: NPE + // https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64662 + public void testNullPointerException445_64662() throws Exception + { + // Content itself odd, generated by Fuzz; but needs to trigger buffering to work + try { + YAML_MAPPER.readValue(" :: ! 0000000000000000000000000000", ModelContainer445.class); + fail("Should not pass"); + } catch (JacksonException e) { + verifyException(e, "Unrecognized field"); + } + } }