Merge branch '2.18' into 2.19

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -462,6 +462,11 @@ Justin Gosselin (@jgosselin-accesso)
   `JsonWriteFeature.COMBINE_UNICODE_SURROGATES_IN_UTF8` is enabled
   (2.18.2)
 
+Haruki (@stackunderflow111)
+ * Reported #1398: feature COMBINE_UNICODE_SURROGATES_IN_UTF8 doesn't work
+  when custom characterEscape is used
+  (2.18.2)
+
 Eduard Gomoliako (@Gems)
  * Contributed #1356: Make `JsonGenerator::writeTypePrefix` method to not write a
   `WRAPPER_ARRAY` when `typeIdDef.id == null`

release-notes/VERSION-2.x

@@ -34,6 +34,9 @@ a pure JSON library.
   JSON structures and existing infinite values
  (reported by @Rodenstock)
  (fix contributed by @pjfanning)
+#1398: Fix issue that feature COMBINE_UNICODE_SURROGATES_IN_UTF8 doesn't work
+  when custom characterEscape is used
+ (reported and fixed by @stackunderflow111)
 
 2.18.2 (27-Nov-2024)
 

src/main/java/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java

@@ -1732,6 +1732,16 @@ private final void _writeCustomStringSegment2(final char[] cbuf, int offset, fin
                 outputBuffer[outputPtr++] = (byte) (0xc0 | (ch >> 6));
                 outputBuffer[outputPtr++] = (byte) (0x80 | (ch & 0x3f));
             } else {
+                // 3- or 4-byte character
+                if (_isStartOfSurrogatePair(ch)) {
+                    final boolean combineSurrogates = Feature.COMBINE_UNICODE_SURROGATES_IN_UTF8.enabledIn(_features);
+                    if (combineSurrogates && offset < end) {
+                        char highSurrogate = (char) ch;
+                        char lowSurrogate = cbuf[offset++];
+                        outputPtr = _outputSurrogatePair(highSurrogate, lowSurrogate, outputPtr);
+                        continue;
+                    }
+                }
                 outputPtr = _outputMultiByteChar(ch, outputPtr);
             }
         }
@@ -1789,6 +1799,16 @@ private final void _writeCustomStringSegment2(final String text, int offset, fin
                 outputBuffer[outputPtr++] = (byte) (0xc0 | (ch >> 6));
                 outputBuffer[outputPtr++] = (byte) (0x80 | (ch & 0x3f));
             } else {
+                // 3- or 4-byte character
+                if (_isStartOfSurrogatePair(ch)) {
+                    final boolean combineSurrogates = Feature.COMBINE_UNICODE_SURROGATES_IN_UTF8.enabledIn(_features);
+                    if (combineSurrogates && offset < end) {
+                        char highSurrogate = (char) ch;
+                        char lowSurrogate = text.charAt(offset++);
+                        outputPtr = _outputSurrogatePair(highSurrogate, lowSurrogate, outputPtr);
+                        continue;
+                    }
+                }
                 outputPtr = _outputMultiByteChar(ch, outputPtr);
             }
         }

src/test/java/com/fasterxml/jackson/core/write/SurrogateWrite223Test.java

@@ -123,4 +123,21 @@ void checkNonSurrogates() throws Exception {
         assertTrue(json.contains("foo\u3042bar"));
         assertTrue(json.contains("\"test_emoji\":\"\uD83D\uDE0A\""));
     }
+
+    @Test
+    void checkSurrogateWithCharacterEscapes() throws Exception {
+        JsonFactory f = JsonFactory.builder()
+                .enable(JsonWriteFeature.COMBINE_UNICODE_SURROGATES_IN_UTF8)
+                .build();
+        f.setCharacterEscapes(JsonpCharacterEscapes.instance());
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (JsonGenerator gen = f.createGenerator(out)) {
+            gen.writeStartObject();
+            // Outside the BMP; 0x1F60A - emoji
+            gen.writeStringField("test_emoji", new String(Character.toChars(0x1F60A)));
+            gen.writeEndObject();
+        }
+        String json = out.toString("UTF-8");
+        assertEquals("{\"test_emoji\":\"\uD83D\uDE0A\"}", json);
+    }
 }