Merge pull request #716 from byroot/fix-script-safe-kanji

Fix generate(script_safe: true) to not confuse unrelated characters
ruby · Dec 3, 2024 · 20b501a · 20b501a
2 parents d0c38f2 + 93a7f87
commit 20b501a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
@@ -155,7 +155,7 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE str, const char esca
                 }
                 case 3: {
                     unsigned char b2 = ptr[pos + 1];
-                    if (RB_UNLIKELY(out_script_safe && b2 == 0x80)) {
+                    if (RB_UNLIKELY(out_script_safe && ch == 0xE2 && b2 == 0x80)) {
                         unsigned char b3 = ptr[pos + 2];
                         if (b3 == 0xA8) {
                             FLUSH_POS(3);

diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
@@ -455,6 +455,10 @@ def test_backslash
     data = ["'"]
     json = '["\\\'"]'
     assert_equal '["\'"]', generate(data)
+    #
+    data = ["倩", "瀨"]
+    json = '["倩","瀨"]'
+    assert_equal json, generate(data, script_safe: true)
   end
 
   def test_string_subclass