Add failing test for #236 (in 2.11 in case we can add fix there)

FasterXML · Jan 29, 2021 · a13523f · a13523f
1 parent b38679f
commit a13523f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/AmbiguousUnionWriteTest.java b/avro/src/test/java/com/fasterxml/jackson/dataformat/avro/AmbiguousUnionWriteTest.java
@@ -1,8 +1,5 @@
 package com.fasterxml.jackson.dataformat.avro;
 
-import com.fasterxml.jackson.dataformat.avro.AvroMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroSchema;
-
 /* 23-Aug-2017, tatu: There was some confusion on whether potential ambiguity
  *   might be problematic (compared to actual one) -- this test verifies
  *   it should not be.

diff --git a/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/CBORTestBase.java b/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/CBORTestBase.java
@@ -23,7 +23,7 @@ public abstract class CBORTestBase
     protected CBORParser cborParser(ByteArrayOutputStream bytes) throws IOException {
         return cborParser(bytes.toByteArray());
     }
-    
+
     protected CBORParser cborParser(byte[] input) throws IOException {
         return cborParser(cborFactory(), input);
     }

diff --git a/...est/java/com/fasterxml/jackson/dataformat/cbor/failing/ParseInvalidUTF8String236Test.java b/...est/java/com/fasterxml/jackson/dataformat/cbor/failing/ParseInvalidUTF8String236Test.java
@@ -0,0 +1,20 @@
+package com.fasterxml.jackson.dataformat.cbor.failing;
+
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.dataformat.cbor.CBORParser;
+import com.fasterxml.jackson.dataformat.cbor.CBORTestBase;
+
+public class ParseInvalidUTF8String236Test extends CBORTestBase
+{
+    // [dataformats-binary#236]: Ends with the first byte of alleged 2-byte
+    // UTF-8 character; parser trying to access second byte beyond end.
+    public void testArrayIssue236() throws Exception
+    {
+        final byte[] input = {0x66, (byte) 0xef, 0x7d, 0x7d, 0xa, 0x2d, (byte) 0xda};
+        try (CBORParser p = cborParser(input)) {
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals("foobar", p.getText());
+            assertNull(p.nextToken());
+        }
+    }
+}
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindRoundtripTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindRoundtripTest.java
@@ -32,9 +32,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.ion.EnumAsIonSymbolSerializer;
-import com.fasterxml.jackson.dataformat.ion.IonSymbolSerializer;
-import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
 
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSystem;

diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/BaseTestForSmile.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/BaseTestForSmile.java
@@ -9,9 +9,7 @@
 import org.junit.Assert;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
 
 public abstract class BaseTestForSmile