From: drh <>
Date: Mon, 12 Jun 2023 14:09:11 +0000 (+0000)
Subject: Defer setting the BTS_PAGESIZE_FIXED flag until after we are certain there
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfa35c0c2d358a07092f38fe4c5fbd2a7982461f;p=thirdparty%2Fsqlite.git

Defer setting the BTS_PAGESIZE_FIXED flag until after we are certain there
are no errors and the page size has been set.
[forum:/forumpost/b901808856|Forum post b901808856].

FossilOrigin-Name: cefaf128d2f1361c7853e4e4679bb3237c6e3a80c19cb71a453033846c3e1211
---

diff --git a/manifest b/manifest
index 2d8ad63f77..44cbf54d98 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extra\sspace\sto\sprevent\sa\sbuffer\soverread\son\scorrupt\sSTAT4\srecords.\ndbsqlfuzz\s7128d1b41ce9df2c007f9c24c1e89e2f1b2590ca.
-D 2023-06-12T14:03:20.311
+C Defer\ssetting\sthe\sBTS_PAGESIZE_FIXED\sflag\suntil\safter\swe\sare\scertain\sthere\nare\sno\serrors\sand\sthe\spage\ssize\shas\sbeen\sset.\n[forum:/forumpost/b901808856|Forum\spost\sb901808856].
+D 2023-06-12T14:09:11.247
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -575,7 +575,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c ba2df6dc07e78ecb8c8c5a33642dd4fd3033e0eb4eed68f991a9cb095255b28f
+F src/btree.c 76290c756bb51c80b6f3f5a27dd41015c692bfb4d042926dc6c08e299a52d9ad
 F src/btree.h aa354b9bad4120af71e214666b35132712b8f2ec11869cb2315c52c81fad45cc
 F src/btreeInt.h b900603c8956bdeb313841f9b67bdeceef32c64d962d35477c07ec25e8cf0f9b
 F src/build.c 7a7217f75f202eff03617ca447bb9c3bc07d5af49da1d3cff2b1a88e8e394686
@@ -2070,10 +2070,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1292d676ea68b9347e3b65b9945749deb45f07bf4c83aa5386c3efcade346932
-Q +ac1d3860af4eb30e4a7444b01d7b5afc91a4b1f5e3fe5414a491c6edc7ff1631
-Q +b99135288b157044e2319833e8632c89483778f876aa45ee66e46ffb6ae42ab2
-R cab5cfce99b12809365e97c7ceb9e8b2
+P 566c4c14dd0ff0b68ef20968b0bbaee92f88374ee969ee6251dc3764ce935267
+Q +30dcc872eb1c9549708009c86357826c4f15ffa17e379dab5cd4aec596643728
+Q +70e12efd1b189560e07f59db03a20b8c1ab19224aae4fc3d7c0bdfd2568064ea
+R cfb96bb8b085f71ee316cf4af342cbcc
 U drh
-Z ee9f0385471ba7a1914d129936b18de9
+Z 53856e76bf06bc74ba3ce250ae8fac8f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dcde303a13..6ff8356932 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-566c4c14dd0ff0b68ef20968b0bbaee92f88374ee969ee6251dc3764ce935267
\ No newline at end of file
+cefaf128d2f1361c7853e4e4679bb3237c6e3a80c19cb71a453033846c3e1211
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index e63349eb20..f352eaed02 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -3338,7 +3338,6 @@ static int lockBtree(BtShared *pBt){
     ){
       goto page1_init_failed;
     }
-    pBt->btsFlags |= BTS_PAGESIZE_FIXED;
     assert( (pageSize & 7)==0 );
     /* EVIDENCE-OF: R-59310-51205 The "reserved space" size in the 1-byte
     ** integer at offset 20 is the number of bytes of space at the end of
@@ -3358,6 +3357,7 @@ static int lockBtree(BtShared *pBt){
       releasePageOne(pPage1);
       pBt->usableSize = usableSize;
       pBt->pageSize = pageSize;
+      pBt->btsFlags |= BTS_PAGESIZE_FIXED;
       freeTempSpace(pBt);
       rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize,
                                    pageSize-usableSize);
@@ -3377,6 +3377,7 @@ static int lockBtree(BtShared *pBt){
     if( usableSize<480 ){
       goto page1_init_failed;
     }
+    pBt->btsFlags |= BTS_PAGESIZE_FIXED;
     pBt->pageSize = pageSize;
     pBt->usableSize = usableSize;
 #ifndef SQLITE_OMIT_AUTOVACUUM