From: drh <>
Date: Thu, 24 Feb 2022 01:41:14 +0000 (+0000)
Subject: Fix an assert() so that it is still valid following OOM with the latest
X-Git-Tag: version-3.39.0~374
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdc59c82ad43f741274d8ca20203b1195c8a62ac;p=thirdparty%2Fsqlite.git

Fix an assert() so that it is still valid following OOM with the latest
enhancements.

FossilOrigin-Name: ecf832f71fbaee36ee10f6da5bde19a8af9f90adbba06e8c5706d18b768bae1f
---

diff --git a/manifest b/manifest
index e3e9f526e5..8a2a1734ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sversion\snumber\sof\sversion\s3.39.0\sfor\sthe\snext\sdevelopment\scycle.
-D 2022-02-24T01:08:53.800
+C Fix\san\sassert()\sso\sthat\sit\sis\sstill\svalid\sfollowing\sOOM\swith\sthe\slatest\nenhancements.
+D 2022-02-24T01:41:14.942
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -492,7 +492,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 50a8f846a1cad4e903aa31afe94df6ec329ac0cafba12977dcb7fc8b076a57d0
+F src/btree.c 11dfaa11397d415fe760ed96d447a1d0cd50db8bd1ee11a91c81a97e364f648c
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 7282a6e77775f93a6eb78d3a41dab372a01a4ec1d93d3b4728d191d15fda42e2
 F src/build.c 9891c2160886cf7e344d7e8f1f7177f9612916c7c67ffeacd64cb34a92d387a8
@@ -1944,8 +1944,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 7ad829224adbec5d74ff9e5ab040eb2ad3e17fe45da7a2cf0cca770a0731401a
-R bb2ca2b22fef0360a3282231ca50752e
+P 9542e9bebbd25b20228fa2366b76d55845a40f12fdc4bbd077d1cb48e32b8cf2
+R 83fc7b1d5ad52a1020e03f9e6b22b358
 U drh
-Z 21720323eb2a9807a637b350c35e01d5
+Z 0b7f17dc3bbf2617bd43295134016fde
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9df7be6c20..d8d9052175 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9542e9bebbd25b20228fa2366b76d55845a40f12fdc4bbd077d1cb48e32b8cf2
\ No newline at end of file
+ecf832f71fbaee36ee10f6da5bde19a8af9f90adbba06e8c5706d18b768bae1f
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 25bf8eaf9b..288a141ec6 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -2303,7 +2303,9 @@ getAndInitPage_error1:
     pCur->pPage = pCur->apPage[pCur->iPage];
   }
   testcase( pgno==0 );
-  assert( pgno!=0 || rc==SQLITE_CORRUPT );
+  assert( pgno!=0 || rc==SQLITE_CORRUPT 
+                  || rc==SQLITE_IOERR_NOMEM
+                  || rc==SQLITE_NOMEM );
   return rc;
 }