From: dan <Dan Kennedy>
Date: Sat, 1 Jan 2022 20:02:58 +0000 (+0000)
Subject: Fix an assert() in pager.c to avoid the possibility of side-effects.
X-Git-Tag: version-3.38.0~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ce289d0886282d7906e473452ddd7c49956607d;p=thirdparty%2Fsqlite.git

Fix an assert() in pager.c to avoid the possibility of side-effects.

FossilOrigin-Name: 1d1fe03c752267f03f015ada975876f65e2a7b967e19f057b5c73f95d7df8a9c
---

diff --git a/manifest b/manifest
index b3a6634158..0baf199afc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\sfix\sa\sharmless\scompiler\swarning\sin\sFTS5.
-D 2022-01-01T19:55:29.471
+C Fix\san\sassert()\sin\spager.c\sto\savoid\sthe\spossibility\sof\sside-effects.
+D 2022-01-01T20:02:58.185
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -537,7 +537,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c f5ad51cfd024116db8531feab9efd831c2621436dca1464e4ff1e8af9bf3252e
 F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c b0f75fde773ad69da997fe57153cdef53c5f0bcf4cd4c7dda19f5fd8e7fb488b
+F src/pager.c dda556cb412e66c3d4016214ef2dd63d9019ad24d1ceff871b79dcb860981f77
 F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 F src/parse.y 761b5d30a7ea9bd2db3b3571438cfcceb5f7dbf4fcad6881c8de65bdda07135a
 F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
@@ -1936,8 +1936,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 73c2b50211d3ae26aeb89976ec7b9fcd7de9f152b283ec7d0809ad18bddc603e
-R 81090d8353ee3f936c93337e56dfc232
-U drh
-Z 765a5c4cd45e00d0f6e7d0350955b24c
+P 8e619c21e2326be1538b60908e7cd211558ec840835c6eb69e768eb190e1fd0b
+R 6db54dc637e31deb110e7ca557bebf75
+U dan
+Z 3630f18f1280e005938a7d4c214cb21c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5603314e9f..bc10a1482a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8e619c21e2326be1538b60908e7cd211558ec840835c6eb69e768eb190e1fd0b
\ No newline at end of file
+1d1fe03c752267f03f015ada975876f65e2a7b967e19f057b5c73f95d7df8a9c
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 1d295896bc..045bd8040e 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -3900,8 +3900,7 @@ static int pager_wait_on_lock(Pager *pPager, int locktype){
 **      current database image, in pages, OR
 **
 **   b) if the page content were written at this time, it would not
-**      be necessary to write the current content out to the sub-journal
-**      (as determined by function subjRequiresPage()).
+**      be necessary to write the current content out to the sub-journal.
 **
 ** If the condition asserted by this function were not true, and the
 ** dirty page were to be discarded from the cache via the pagerStress()
@@ -3916,8 +3915,16 @@ static int pager_wait_on_lock(Pager *pPager, int locktype){
 */
 #if defined(SQLITE_DEBUG)
 static void assertTruncateConstraintCb(PgHdr *pPg){
+  Pager *pPager = pPg->pPager;
   assert( pPg->flags&PGHDR_DIRTY );
-  assert( pPg->pgno<=pPg->pPager->dbSize || !subjRequiresPage(pPg) );
+  if( pPg->pgno>pPager->dbSize ){      /* if (a) is false */
+    Pgno pgno = pPg->pgno;
+    int i;
+    for(i=0; i<pPg->pPager->nSavepoint; i++){
+      PagerSavepoint *p = &pPager->aSavepoint[i];
+      assert( p->nOrig<pgno || sqlite3BitvecTestNotNull(p->pInSavepoint,pgno) );
+    }
+  }
 }
 static void assertTruncateConstraint(Pager *pPager){
   sqlite3PcacheIterateDirty(pPager->pPCache, assertTruncateConstraintCb);