Fix handling of an OOM case broken by [11015b4e].

FossilOrigin-Name: 1f3a805d19c03152bffba783f31d7c2043206c43221847005190c93033d97cf0

diff --git a/manifest b/manifest
index a4ed2d43c4eea8bae12bbc00eb9487320dc3d8bf..91a90c337e0bd3635b0118508d7c48f408835017 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sSQLITE_DIRECT_OVERFLOW_READ\sbuilds\sthat\scould\sallow\sa\sconcurrent\stransaction\sto\sbe\scommitted\seven\sif\sit\sread\sfrom\san\soverflow\spage\sthat\swas\smodified\sconcurrently,\sin\scases\swhere\sthe\soverflow\spage\swas\swritten\swithout\salso\swriting\sthe\sb-tree\spage\sto\swhich\sit\sis\slinked.
-D 2024-03-29T18:07:41.196
+C Fix\shandling\sof\san\sOOM\scase\sbroken\sby\s[11015b4e].
+D 2024-03-29T18:19:51.581
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -745,7 +745,7 @@ F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d87210
 F src/os_unix.c 400bd61bef6405ff75475690ecb40cf6bb6d8ffb0ec454329fe77d6c84f42a9f
 F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c dc75e2a5d5c916cc58d5a280d6fdafc4ba645034a7c27c9f5691a1c07a3aa199
+F src/pager.c 9ab2b2916b22ce1cacfd8e4912040fe4a6721f575cfe73589f2d63eebd72a899
 F src/pager.h dd6ade22dd303a8ca6c34f1ff0f299add7191c1bff65f0289b7fd7c3460f9551
 F src/parse.y 08247e876d6508e7bcf624d48f4993f4051899e1e73400fe7da9de34af755a90
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
@@ -2220,9 +2220,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 19ff2d4e1e7c6d29773d76ba752338c1c2e9ab355cdd45aed1d936880fa1c917
-Q +49263c9136c81638833aa71c9d590e318ead2ca60c4d7207ebf8884174df9c8f
-R 917aec6b3a199fcb35c3b5297d51faf1
+P 11015b4ed161263ae14bcd0fe6a24074a545bb6d2a0b3f6f1f75ba3eaa91bfc0
+Q +9e6b64decb42dfebd3b882fd93f3bbfec11eca83b754514cc72c90616ca6f9dd
+R 07bbf5a9cb96c86f6d5b79c6c6141e6b
 U dan
-Z 2d6ffda77a836c2f76cf18db98912e02
+Z cc7e14a7d98496bfa50d05249494257c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7cb0bbdf19049bd7ebdf0a0af72b5f4913b7505e..d34fcce726f81d9bdb7efa3b018a39c702eaf405 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-11015b4ed161263ae14bcd0fe6a24074a545bb6d2a0b3f6f1f75ba3eaa91bfc0
\ No newline at end of file
+1f3a805d19c03152bffba783f31d7c2043206c43221847005190c93033d97cf0
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 9a6d6de909b1e9d93d0fe1913ea932d375061898..b8dd190260a7ef23181a37cacd3d5e40d9a41782 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -5611,7 +5611,7 @@ static int getPageNormal(
   /* If this is an CONCURRENT transaction and the page being read was
   ** present in the database file when the transaction was opened,
   ** mark it as read in the pAllRead vector.  */
-  if( sqlite3PagerUsePage(pPager, pgno)!=SQLITE_OK ){
+  if( (rc = sqlite3PagerUsePage(pPager, pgno))!=SQLITE_OK ){
     pPg = 0;
     goto pager_acquire_err;
   }