Merge branch '2.17'

FasterXML · Jan 13, 2024 · 0801ba2 · 0801ba2
2 parents ae7f199 + 61c2f1f
commit 0801ba2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLParser.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLParser.java
@@ -342,6 +342,13 @@ public JsonToken nextToken() throws JacksonException
                 evt = _yamlParser.next();
             } catch (org.snakeyaml.engine.v2.exceptions.YamlEngineException e) {
                 throw new JacksonYAMLParseException(this, e.getMessage(), e);
+            } catch (NumberFormatException e) {
+                // 12-Jan-2024, tatu: As per https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=63274
+                //    we seem to have unhandled case by SnakeYAML
+                throw _constructReadException(String.format(
+                        "Malformed Number token: failed to tokenize due to (%s): %s",
+                        e.getClass().getName(), e.getMessage()),
+                        e);
             }
             // is null ok? Assume it is, for now, consider to be same as end-of-doc
             if (evt == null) {

diff --git a/...ormat/yaml/ser/FuzzYAMLRead63274Test.java → ...rmat/yaml/fuzz/FuzzYAMLRead63274Test.java b/...ormat/yaml/ser/FuzzYAMLRead63274Test.java → ...rmat/yaml/fuzz/FuzzYAMLRead63274Test.java
@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.yaml.failing;
+package tools.jackson.dataformat.yaml.fuzz;
 
 import tools.jackson.core.JacksonException;
 
@@ -11,7 +11,7 @@ public class FuzzYAMLRead63274Test extends ModuleTestBase
     private final ObjectMapper MAPPER = newObjectMapper();
 
     // https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=63274
-    public void testReadBoundary63274() throws Exception
+    public void testMalformedNumber63274() throws Exception
     {
         // As bytes:
         /*
@@ -36,9 +36,9 @@ public void testReadBoundary63274() throws Exception
         try {
             MAPPER.readTree(doc);
             // Ok; don't care about content, just buffer reads
+            fail("Should not pass");
         } catch (JacksonException e) {
-            // !!! TODO: proper checking of exception
-            verifyException(e, "foo");
+            verifyException(e, "Malformed Number token: failed to ");
         }
     }
 }