Fix #366 for 2.14(.3)

FasterXML · Mar 10, 2023 · 0e3505a · 0e3505a
1 parent 9443add
commit 0e3505a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 7 deletions.
diff --git a/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java b/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java
@@ -857,7 +857,7 @@ public void writeRawUTF8String(byte[] raw, int offset, int len)
             return;
         }
         _writeLengthMarker(PREFIX_TYPE_TEXT, len);
-        _writeBytes(raw, 0, len);
+        _writeBytes(raw, offset, len);
     }
 
     @Override

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
@@ -3,6 +3,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Random;
 
@@ -267,6 +268,14 @@ public String q(String str) {
         return '"'+str+'"';
     }
 
+    protected static byte[] utf8Bytes(String str) {
+        return str.getBytes(StandardCharsets.UTF_8);
+    }
+
+    protected static String utf8String(ByteArrayOutputStream bytes) {
+        return new String(bytes.toByteArray(), StandardCharsets.UTF_8);
+    }
+
     protected static byte[] concat(byte[] ... chunks)
     {
         int len = 0;

diff --git a/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/GeneratorLongStringTest.java b/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/GeneratorLongStringTest.java
@@ -45,10 +45,22 @@ public void testLongWithMultiBytes() throws Exception
         for (int i = 0, len = strings.size(); i < len; ++i) {
             String str = strings.get(i);
             // let's mix in alternative representaton as well
-            if ((++fuzz % 7) == 1) {
-                byte[] b = str.getBytes("UTF-8");
-                gen.writeRawUTF8String(b, 0, b.length);
-            } else {
+            switch (++fuzz % 7) {
+            case 1:
+                {
+                    byte[] b = utf8Bytes(str);
+                    gen.writeRawUTF8String(b, 0, b.length);
+                }
+                break;
+            case 2:
+                {
+                    byte[] b = utf8Bytes(str);
+                    byte[] tmp = new byte[b.length + 4];
+                    System.arraycopy(b, 0, tmp, 2, b.length);
+                    gen.writeRawUTF8String(tmp, 2, b.length);
+                }
+                break;
+            default:
                 char[] ch = str.toCharArray();
                 gen.writeString(ch, 0, ch.length);
             }

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -265,3 +265,9 @@ Brian Harrington (brharrington@github)
 
 * Contributed #342: (smile) Possible performance improvement on jdk9+ for Smile decoding
  (2.14.1)
+
+Nik Everett (nik9000@github)
+
+* Reported #366: `CBORGenerator.writeRawUTF8String()` seems to ignore offset
+ (2.14.3)
+
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -15,8 +15,10 @@ Active maintainers:
 
 Not yet released
 
-#354: Missing license file in Maven package for newer versions
+#354: (all) Missing license file in Maven package for newer versions
  (reported by Philipp d-S)
+#366: `CBORGenerator.writeRawUTF8String()` seems to ignore offset
+ (reported by Nik E)
 
 2.14.2 (28-Jan-2023)
 

diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithRawUtf8.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithRawUtf8.java
@@ -30,8 +30,16 @@ public void testUtf8RawStrings() throws Exception
         SmileFactory jf = new SmileFactory();
         JsonGenerator jgen = jf.createGenerator(out, JsonEncoding.UTF8);
         jgen.writeStartArray();
+        int counter = 0;
         for (byte[] str : strings) {
-            jgen.writeRawUTF8String(str, 0, str.length);
+            // 09-Mar-2023, tatu: Let's use offset...
+            if ((++counter & 3) == 0) {
+                byte[] tmp = new byte[str.length + 4];
+                System.arraycopy(str, 0, tmp, 2, str.length);
+                jgen.writeRawUTF8String(tmp, 2, str.length);
+            } else {
+                jgen.writeRawUTF8String(str, 0, str.length);
+            }
         }
         jgen.writeEndArray();
         jgen.close();