From: drh <>
Date: Sat, 2 Dec 2023 15:59:48 +0000 (+0000)
Subject: Do not allow a JsonParse object to be considered "editable" after an OOM.
X-Git-Tag: version-3.45.0~116^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c26bde4ff7e022c4d774ce9a4c27ca56ce65279;p=thirdparty%2Fsqlite.git

Do not allow a JsonParse object to be considered "editable" after an OOM.

FossilOrigin-Name: c6bacf57bd6fe0fee00c9d41163a270b60997c20659949971bbf5c6c62622bfe
---

diff --git a/manifest b/manifest
index 38a7efdf50..1affea972f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\spotential\sunsigned\sinteger\sunderflow\sin\sjsonAppendString().
-D 2023-12-02T15:06:43.574
+C Do\snot\sallow\sa\sJsonParse\sobject\sto\sbe\sconsidered\s"editable"\safter\san\sOOM.
+D 2023-12-02T15:59:48.114
 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 c3167c9737da0f3f45538c7599bbf3f090d1ba1e444e4e743935496f37cbddcc
+F src/json.c 837599bcccc7b1533273d17697b33acb747f6a742e0789a716a1d991e83b76ea
 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 c3677ba410208c07b711f5f526eb5cf039a8eee49f632c7ae04fa55cdfbb9058
-R 13d01dca5d473a81616de1c5ea4e5269
+P d2fba2cbdc3870d34228c1a9446eced884325acc183900d7dd0b96132570fb4a
+R 4ccb83954df0ebdab5ce51302095cafb
 U drh
-Z bee957be31c329bcce231111ed4f35d1
+Z 5295c6ae0590ca2382d336c94f2f32b0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0f4a0c9d1d..ba27b52b90 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2fba2cbdc3870d34228c1a9446eced884325acc183900d7dd0b96132570fb4a
\ No newline at end of file
+c6bacf57bd6fe0fee00c9d41163a270b60997c20659949971bbf5c6c62622bfe
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 83bf3e7337..334829f9cf 100644
--- a/src/json.c
+++ b/src/json.c
@@ -1044,6 +1044,7 @@ static int jsonBlobMakeEditable(JsonParse *pParse, u32 nExtra){
   u8 *aOld;
   u32 nSize;
   assert( !pParse->bReadOnly );
+  if( pParse->oom ) return 0;
   if( pParse->nBlobAlloc>0 ) return 1;
   aOld = pParse->aBlob;
   nSize = pParse->nBlob + nExtra;