From: drh <>
Date: Tue, 17 Oct 2023 13:47:41 +0000 (+0000)
Subject: Fix a JSON bug introduced in 3.43.0.  The problem occurs when doing a
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0fa20f3f5ab9a9f30480d86660b615df82f137d;p=thirdparty%2Fsqlite.git

Fix a JSON bug introduced in 3.43.0.  The problem occurs when doing a
JSON_EXTRACT() on an array element that was added by JSON_SET() without
first reparsing.

FossilOrigin-Name: 3161c2cdc9cde433e7ce35ccaed0987fc35ed95772c83a26bfd7a171ab9632f1
---

diff --git a/manifest b/manifest
index 8419826d0e..e30ab60844 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\suse\sof\san\suninitialized\svalue\sthat\soccurs\swhen\sdoing\sa\sjson_insert()\nof\sa\sstring\svalue\sthat\scontains\sembedded\sU+0000\scharacters.
-D 2023-10-11T17:34:50.922
+C Fix\sa\sJSON\sbug\sintroduced\sin\s3.43.0.\s\sThe\sproblem\soccurs\swhen\sdoing\sa\nJSON_EXTRACT()\son\san\sarray\selement\sthat\swas\sadded\sby\sJSON_SET()\swithout\nfirst\sreparsing.
+D 2023-10-17T13:47:41.022
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -644,7 +644,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 dcccb1617b217587c7381db557e06b10cdcd2a0438a572ef7ac3435bea40a83c
+F src/json.c efa31f318ed3580764ab95563394cb6312a35a0dc997fe241baf0f169f40a66e
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c fde8f13c876a658b4e8b74b77d875ca887915c174ea6a2f3122d80966f93d865
@@ -1273,7 +1273,7 @@ F test/json/README.md 63e3e589e1df8fd3cc1588ba1faaff659214003f8b77a15af5c6452b35
 F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f
 F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307
 F test/json/json-speed-check.sh 8b7babf530faa58bd59d6d362cec8e9036a68c5457ff46f3b1f1511d21af6737 x
-F test/json101.test 1ad070e5616dee76bffbe9724e6add16ab7ad506d5af9e606627b163baf1a7b4
+F test/json101.test bc05d2476fd6f7ead31ec05b43d1b24b2b193ae112fd8f0d2ed56d9a904f9fa5
 F test/json102.test 4c69694773a470f1fda34e5f4ba24920b35184fb66050b450fc2ef9ab5ad310b
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
@@ -2093,9 +2093,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3a79cf25e3df516c3ab3faab3085a87385df30d29d4bdd0e72b3607243887fd3
-Q +d3c0cbb90966316be9cd25e3edb501da42731e8a83c13227b90ce17d3975a2c3
-R dbb86c23946123428beaf025b32bda45
+P 7dcd9cfedc521d34bd41f7d1c045f2c70916c10655044667f87bb9b0b4a3fcf3
+Q +e5099c549a1d8959d4015516f090b8e6438e517a64b20651175bf5413d94fb58
+R d9c26da6c3a9de4d3cce9d5d89ae53d6
 U drh
-Z 0b291023bd7147d5dfbf7e9621736a02
+Z ac0a250378a2cc3237241be93bcc0cc3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0ecd91b78c..c1701a570f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7dcd9cfedc521d34bd41f7d1c045f2c70916c10655044667f87bb9b0b4a3fcf3
\ No newline at end of file
+3161c2cdc9cde433e7ce35ccaed0987fc35ed95772c83a26bfd7a171ab9632f1
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index fa3163928b..9659120826 100644
--- a/src/json.c
+++ b/src/json.c
@@ -2156,6 +2156,7 @@ static JsonNode *jsonLookupStep(
         if( (pRoot[j].jnFlags & JNODE_REMOVE)==0 || pParse->useMod==0 ) i--;
         j += jsonNodeSize(&pRoot[j]);
       }
+      if( i==0 && j<=pRoot->n ) break;
       if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
       if( pParse->useMod==0 ) break;
       assert( pRoot->eU==2 );
diff --git a/test/json101.test b/test/json101.test
index d734dbb0e1..c62991bbbf 100644
--- a/test/json101.test
+++ b/test/json101.test
@@ -1042,5 +1042,18 @@ do_execsql_test json101-22.2 {
   );
 } {{{"a":2,"b":4,"c":6}}}
 
+# 2023-10-17 https://sqlite.org/forum/forumpost/fc0e3f1e2a
+# Incorrect accesss to '$[0]' in parsed + edited JSON.
+#
+do_execsql_test json101-23.1 {
+  SELECT j, j->>0, j->>1
+    FROM (SELECT json_set(json_set('[]','$[#]',0), '$[#]',1) AS j);
+} {{[0,1]} 0 1}
+do_execsql_test json101-23.2 {
+  SELECT j, j->>0, j->>1
+    FROM (SELECT json_set('[]','$[#]',0,'$[#]',1) AS j);
+} {{[0,1]} 0 1}
+
+
 
 finish_test