From: drh <>
Date: Sun, 1 Oct 2023 18:59:34 +0000 (+0000)
Subject: Fix problems following OOM in JSONB parsing.
X-Git-Tag: version-3.45.0~116^2~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b176f863b41dc34dd7e5abcbb593500751848e6;p=thirdparty%2Fsqlite.git

Fix problems following OOM in JSONB parsing.

FossilOrigin-Name: 0d8cd6b5fb592f88f593ceaad9cdfa95dcfdf14169c3a56a5becbd66d62fd02b
---

diff --git a/manifest b/manifest
index c46034ef3b..892d400ef4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Restore\sthe\strunk\sversion\sof\ssqlite3_user_data().\s\sFix\sthe\sxColumn\sfor\svirtual\ntables\sso\sthat\sthe\ssqlite3_context\scontains\sa\svalid\sbut\sNULL\suser\sdata\spointer.
-D 2023-09-30T16:50:17.069
+C Fix\sproblems\sfollowing\sOOM\sin\sJSONB\sparsing.
+D 2023-10-01T18:59:34.631
 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 d4de26b1c8a18949b80a89d457c4714a00cc65c8b32b965a5f921556daeb48f8
+F src/json.c 253ca59ae7f4be5fa7e0d630f9073f6d2f8b6dd89b47d80192f3b037271fe45e
 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 6daa7b69695e1b68dba317abbcad4d0205c91963d4a9eb2d595a3ec10fa0fdf4
-R 156c1068608d73b6c04a73abb658869e
+P 15ffd932fecc82a5791b2024f55d2ec80887e8eb7345de68d6f5cac4912cfbe8
+R 32ce5e0c8d0e91f62fdd054af5b27453
 U drh
-Z 48c7e5fa14a791868247c634dc1c52ad
+Z 6f251c6f66875dddb0d77e3789c48938
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 121b0eb585..ffd32b4c8c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-15ffd932fecc82a5791b2024f55d2ec80887e8eb7345de68d6f5cac4912cfbe8
\ No newline at end of file
+0d8cd6b5fb592f88f593ceaad9cdfa95dcfdf14169c3a56a5becbd66d62fd02b
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 0089584e62..9f41ca4343 100644
--- a/src/json.c
+++ b/src/json.c
@@ -1612,7 +1612,9 @@ json_parse_restart:
       pParse->iErr = j;
       return -1;
     }
-    pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+    if( !pParse->oom ){
+      pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+    }
     pParse->iDepth--;
     return j+1;
   }
@@ -3493,7 +3495,9 @@ static int jsonParseValueFromBlob(JsonParse *pParse, u32 i){
         if( r<=0 ) return -1;
         j = (u32)r;
       }
-      pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+      if( !pParse->oom ){
+        pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+      }
       break;
     }
     case JSONB_OBJECT: {
@@ -3507,7 +3511,9 @@ static int jsonParseValueFromBlob(JsonParse *pParse, u32 i){
         }
         j = (u32)r;
       }
-      pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+      if( !pParse->oom ){
+        pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+      }
       break;
     }
   }