From: drh <>
Date: Tue, 3 Oct 2023 10:43:30 +0000 (+0000)
Subject: Fix an issue with the use of jsonb_group_array() and jsonb_group_object()
X-Git-Tag: version-3.45.0~116^2~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8405e1140a6eefd2ab7e2a02a36e527caba07ca9;p=thirdparty%2Fsqlite.git

Fix an issue with the use of jsonb_group_array() and jsonb_group_object()
when used by window functions.

FossilOrigin-Name: 808bd349ba587fbcdc4aea3f9c08e0df01ba08dec181c5af5ea157e89d86ff7b
---

diff --git a/manifest b/manifest
index c3140c8eee..ea14e67936 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scases\sfor\sJSONB.
-D 2023-10-02T23:56:46.985
+C Fix\san\sissue\swith\sthe\suse\sof\sjsonb_group_array()\sand\sjsonb_group_object()\nwhen\sused\sby\swindow\sfunctions.
+D 2023-10-03T10:43:30.961
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -670,7 +670,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c a2e70610cc14d0f97feb17bf0000c0e034f1cb5ac1b318bcf3ccf7a014f01a80
+F src/json.c 87218d0698545f668879e2a0f51dc5e3982de7d8cccfc0d0a27ede23f26f68d7
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -2123,8 +2123,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 54197149b811d30b6c4487eedf5692b164ed0f90cfcc541aa3157094f5f17f6a
-R f7716cc560ac345b0556f46a68783d4e
+P 6d4aeff5751722c83ebb0e1f21072b72be418c64dcf28ee032d3a548e1b3a951
+R d0d4e794647619bd04667ee02e2f09dc
 U drh
-Z aa79deaa2b4777d46e48ea5272670f4a
+Z 873b50f85fdb68283d7ad2c516b8f579
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cc209c225a..c2bdadfa3b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6d4aeff5751722c83ebb0e1f21072b72be418c64dcf28ee032d3a548e1b3a951
\ No newline at end of file
+808bd349ba587fbcdc4aea3f9c08e0df01ba08dec181c5af5ea157e89d86ff7b
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 1e40668f9f..50da24b897 100644
--- a/src/json.c
+++ b/src/json.c
@@ -4897,6 +4897,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){
       assert( pStr->bStatic );
     }else if( flags & JSON_BLOB ){
       jsonReturnStringAsBlob(pStr);
+      if( !isFinal ) pStr->nUsed--;
       return;
     }else if( isFinal ){
       sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed,
@@ -5012,6 +5013,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
       assert( pStr->bStatic );
     }else if( flags & JSON_BLOB ){
       jsonReturnStringAsBlob(pStr);
+      if( !isFinal ) pStr->nUsed--;
       return;
     }else if( isFinal ){
       sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed,