Rework the jsonEachPathLength() routine in json_tree() so that it is

less susceptible to problems due to goofy object labels.

FossilOrigin-Name: 858b76a00e8ff55215f7a2e6a4cd77fc4d4f98dea7224cd90488744f5ce246a4

diff --git a/manifest b/manifest
index 89fc123d14df404fc32fbaf71d0ac9ba0f86e174..de24979e9b8543f0854bee8485ba33db3ffb5c72 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sALWAYS()\son\sbranches\sadded\sin\s[ec0ae4030968c782]\sthat\sare\salways\strue.
-D 2023-12-07T13:14:34.585
+C Rework\sthe\sjsonEachPathLength()\sroutine\sin\sjson_tree()\sso\sthat\sit\sis\nless\ssusceptible\sto\sproblems\sdue\sto\sgoofy\sobject\slabels.
+D 2023-12-07T14:09:25.017
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -696,7 +696,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 674cabf943f30d735c8ffd50e4ae1b4e3ccb52fd7cddae4c556ebcf7f410f0c8
+F src/json.c 3d64e42894afcda2efe8b112e8e2accd66fbeb150d7b1a073f20fc4a232faa37
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2153,8 +2153,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 b014736c1f80ccc46fb4b24ac04310a6ce5cb5b6653665efff366cb3bc742257
-R 4ecf43441052e986caaa2b649977f529
+P 451cef8609e96dd9244818adc5c6f240544694bcb4ae620e88f90e403e59d70f
+R 7ecf4ae92b8b647771c0ed38f3fc271f
 U drh
-Z 9ea0563bc67b852b5f4309987080e02f
+Z 2abe6b160a42e7f20184ba1ba8e11b5c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 12ad7048bf25616aef16e3e4a00c5ed7cf779c55..edeb1479b65d0e9f75d3eeb1d5cf05347469743f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-451cef8609e96dd9244818adc5c6f240544694bcb4ae620e88f90e403e59d70f
\ No newline at end of file
+858b76a00e8ff55215f7a2e6a4cd77fc4d4f98dea7224cd90488744f5ce246a4
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 850e2241e60b715de68811ffc32efefd27137b11..6a4a0babfcd65aea814e67a4d7e113eef8ecb536 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -4521,23 +4521,20 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
 */
 static int jsonEachPathLength(JsonEachCursor *p){
   u32 n = p->path.nUsed;
-  const char *z = p->path.zBuf;
-  if( p->iRowid==0 && p->bRecursive && n>1 ){
-    if( z[n-1]==']' ){
-      do{
-        assert( n>1 );
-        n--;
-      }while( z[n]!='[' );
-    }else if( z[n-1]=='"' ){
-      do{
-        assert( n>1 );
-        n--;
-      }while( z[n]!='.' || z[n+1]!='"' );
-    }else{
-      do{
-        assert( n>1 );
-        n--;
-      }while( z[n]!='.' );
+  char *z = p->path.zBuf;
+  if( p->iRowid==0 && p->bRecursive && n>=2 ){
+    while( n>1 ){
+      n--;
+      if( z[n]=='[' || z[n]=='.' ){
+        u32 x, sz = 0;
+        char cSaved = z[n];
+        z[n] = 0;
+        assert( p->sParse.eEdit==0 );
+        x = jsonLookupStep(&p->sParse, 0, z+1, 0);
+        z[n] = cSaved;
+        if( JSON_LOOKUP_ISERROR(x) ) continue;
+        if( x + jsonbPayloadSize(&p->sParse, x, &sz) == p->i ) break;
+      }
     }
   }
   return n;