From: drh <> Date: Thu, 8 Apr 2021 19:56:58 +0000 (+0000) Subject: Remove an ALWAYS() that might be false under very unusual circumstances. X-Git-Tag: version-3.36.0~230 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55938b5fa0cb637ff6fe2bf000122ac110ca0ed0;p=thirdparty%2Fsqlite.git Remove an ALWAYS() that might be false under very unusual circumstances. dbsqlfuzz 300261f469ace7ecc57ed32ea7b0de3ea9d7dbf. Test case in TH3. FossilOrigin-Name: 466f508973e7adc983a4c9bd7c86b4d9269e3b990183fc7f95a50fe72b832ad0 --- diff --git a/manifest b/manifest index e213fb98c6..56cd3b58c6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Handle\sthe\scorruption\sfixed\sby\sthe\sprevious\scommit\sin\sa\sdifferent\sway\sso\sas\sto\salso\sfix\sdbsqlfuzz\scrash\s753de0a0ac5b25b18f1e4d41e650d3333cdc270c. -D 2021-04-08T19:39:00.906 +C Remove\san\sALWAYS()\sthat\smight\sbe\sfalse\sunder\svery\sunusual\scircumstances.\ndbsqlfuzz\s300261f469ace7ecc57ed32ea7b0de3ea9d7dbf.\s\sTest\scase\sin\sTH3. +D 2021-04-08T19:56:58.010 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -529,7 +529,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c b5b7475bd1a8f1b83b6173a81f4fe50f9e077ccbacb62ce2fe7a5cb89916bce1 F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c 9c46e887c1c342d00deebe0797cc723c7f0942349776cb37d752cf5d7beab985 +F src/pager.c 0c84ba222cc58825098ae7d693db85c69f1700ba2a74d9d395033337a511b4e6 F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f F src/parse.y 77039cf996d9cde8ee1e947ad9284566c30e48cc227766a7be1d475ec7aed9dd F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177 @@ -1912,7 +1912,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 58f36af2271517abafa9f4a46f2a5f97e66c001675c17868282197d599603d1b -R f66b0623947ba640e8e730eba8454a06 -U dan -Z 6c99339f28beab6b463fc646e3d6a411 +P cb27ce25095ab9b5acbe4bf010c7f6d8a71191c2f79b3bf3e63d8655b4fe0769 +R 020de4969459832aee161bf32445ebf7 +U drh +Z 68d218f21dd2d52fe942989c2320ee36 diff --git a/manifest.uuid b/manifest.uuid index d0bebfad22..e396fb6bd1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cb27ce25095ab9b5acbe4bf010c7f6d8a71191c2f79b3bf3e63d8655b4fe0769 \ No newline at end of file +466f508973e7adc983a4c9bd7c86b4d9269e3b990183fc7f95a50fe72b832ad0 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index be06a8a279..3550a13e25 100644 --- a/src/pager.c +++ b/src/pager.c @@ -5837,7 +5837,7 @@ int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){ assert( pPager->eState>=PAGER_READER && pPager->eStatesubjInMemory = (u8)subjInMemory; - if( ALWAYS(pPager->eState==PAGER_READER) ){ + if( pPager->eState==PAGER_READER ){ assert( pPager->pInJournal==0 ); if( pagerUseWal(pPager) ){