Fix corner-case error conditions.

FossilOrigin-Name: ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d

diff --git a/manifest b/manifest
index 4ae8c1871525f26cd194f869234409f4c99f06b8..7736b5bcaf9819492e8e6a16ac5387da3a5c26d6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Same\sresults\sas\sthe\slegacy\sJsonNode\simplementation\son\sa\ssmall\sset\sof\stest\scases.
-D 2023-11-26T00:48:37.511
+C Fix\scorner-case\serror\sconditions.
+D 2023-11-26T00:56:40.131
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -688,7 +688,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 b93f282f032f904118121ae64552972f078ac13adcd7fc982d20f596f97a424a
+F src/json.c 59dd8bf951f0c7b2e1004f406f8690d9743146f176d675da06427f99c75c78f7
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,8 +2145,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 914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0
-R d2ae12035201ed7d53848ee421edc8df
+P c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085
+R 6a83cb0634a1b413d8dd9f72a2caf803
 U drh
-Z e4ce705fdf38aad5873f97f479b0490a
+Z cf069d3ef952e41c66c8bcc7a7e83b20
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a5cbb721e585b81e7e889604b15641e0ec33cd8a..90bef2caadcaaa5b3f52eb521b995a7ea3e6d313 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085
\ No newline at end of file
+ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 14fe274146b95dbc65c83a7f9e86e38a0a7f9026..93176082672289ba38f0ec6bea2efe413da84b4f 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -416,7 +416,7 @@ static void jsonStringReset(JsonString *p){
 */
 static void jsonStringOom(JsonString *p){
   p->eErr |= JSTRING_OOM;
-  sqlite3_result_error_nomem(p->pCtx);
+  if( p->pCtx ) sqlite3_result_error_nomem(p->pCtx);
   jsonStringReset(p);
 }
 
@@ -5766,8 +5766,7 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
     n = jsonbPayloadSize(&p->sParse, i, &sz);
     p->i = i + n + sz;
   }
-  if( p->eType==JSONB_ARRAY ){
-    assert( p->nParent>0 );
+  if( p->eType==JSONB_ARRAY && p->nParent ){
     p->aParent[p->nParent-1].iKey++;
   }
   p->iRowid++;
@@ -5809,7 +5808,6 @@ static int jsonEachColumn(
     case JEACH_KEY: {
       if( p->nParent==0 ){
         u32 n, j;
-        assert( p->iRowid==0 && p->bRecursive );
         if( p->nRoot==1 ) break;
         j = jsonEachPathLength(p);
         n = p->nRoot - j;