Merge branch 'master' into sm/java-vector-simd

Author: headius

.github/workflows/ci.yml

@@ -40,7 +40,6 @@ jobs:
           - { os: ubuntu-latest  , ruby: truffleruby-head }
         exclude:
           - { os: windows-latest, ruby: jruby }
-          - { os: windows-latest, ruby: jruby-head }
 
     steps:
       - uses: actions/checkout@v5

.github/workflows/sync-ruby.yml

@@ -0,0 +1,33 @@
+name: Sync ruby
+on:
+  push:
+    branches: [master]
+jobs:
+  sync:
+    name: Sync ruby
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'ruby' }}
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Create GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: 2060836
+          private-key: ${{ secrets.RUBY_SYNC_DEFAULT_GEMS_PRIVATE_KEY }}
+          owner: ruby
+          repositories: ruby
+
+      - name: Sync to ruby/ruby
+        uses: convictional/[email protected]
+        with:
+          owner: ruby
+          repo: ruby
+          workflow_file_name: sync_default_gems.yml
+          github_token: ${{ steps.app-token.outputs.token }}
+          ref: master
+          client_payload: |
+            {"gem":"${{ github.event.repository.name }}","before":"${{ github.event.before }}","after":"${{ github.event.after }}"}
+          propagate_failure: true
+          wait_interval: 10

CHANGES.md

@@ -2,8 +2,14 @@
 
 ### Unreleased
 
+### 2025-10-07 (2.15.1)
+
+* Fix incorrect escaping in the JRuby extension when encoding shared strings.
+
+### 2025-09-22 (2.15.0)
+
 * `JSON::Coder` callback now receive a second argument to convey whether the object is a hash key.
-* Tuned the floating point number generator to not use scientific notation as agressively.
+* Tuned the floating point number generator to not use scientific notation as aggressively.
 
 ### 2025-09-18 (2.14.1)
 

java/src/json/ext/SWARBasicStringEncoder.java

@@ -27,9 +27,10 @@ void encode(ByteList src) throws IOException {
         // slice a string, the underlying byte array is the same, but the
         // begin index and real size are different. When reading from the ptrBytes
         // array, we need to always add ptr to the index.
-        ByteBuffer bb = ByteBuffer.wrap(ptrBytes, ptr, len);
+        ByteBuffer bb = ByteBuffer.wrap(ptrBytes, 0, ptr + len);
+
         while (pos + 8 <= len) {
-            long x = bb.getLong(pos);
+            long x = bb.getLong(ptr + pos);
             if (skipChunk(x)) {
                 pos += 8;
                 continue;
@@ -48,7 +49,7 @@ void encode(ByteList src) throws IOException {
         }
 
         if (pos + 4 <= len) {
-            int x = bb.getInt(pos);
+            int x = bb.getInt(ptr + pos);
             if (skipChunk(x)) {
                 pos += 4;
             }

lib/json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSON
-  VERSION = '2.14.1'
+  VERSION = '2.15.1'
 end

test/json/json_encoding_test.rb

@@ -35,9 +35,10 @@ def test_generate_shared_string
     # Ref: https://github.com/ruby/json/issues/859
     s = "01234567890"
     assert_equal '"234567890"', JSON.dump(s[2..-1])
+    s = '01234567890123456789"a"b"c"d"e"f"g"h'
+    assert_equal '"\"a\"b\"c\"d\"e\"f\"g\""', JSON.dump(s[20, 15])
     s = "0123456789001234567890012345678900123456789001234567890"
     assert_equal '"23456789001234567890012345678900123456789001234567890"', JSON.dump(s[2..-1])
-
     s = "0123456789001234567890012345678900123456789001234567890"
     assert_equal '"567890012345678900123456789001234567890012345678"', JSON.dump(s[5..-3])
   end