]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Fix an assert that is incorrect for a corrupt database.
authordrh <>
Tue, 31 May 2022 15:18:55 +0000 (15:18 +0000)
committerdrh <>
Tue, 31 May 2022 15:18:55 +0000 (15:18 +0000)
FossilOrigin-Name: fe0a840805b435efd38a953a8aae60e29a35289f9d9955472a8bab2bce7051c8

manifest
manifest.uuid
src/btree.c

index c6ce69d275dfe40735ae01f1b88e6aac9ee14411..56f93f7911b3049cf3a60cfadf1b52ab58d4ba7c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Many\snew\sPG-confirmed\stest\scases\sin\sjoinD.test.
-D 2022-05-31T14:19:04.375
+C Fix\san\sassert\sthat\sis\sincorrect\sfor\sa\scorrupt\sdatabase.
+D 2022-05-31T15:18:55.576
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -507,7 +507,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 df695e953c2ce78ce4878ee5016751df9bc9a921dc0500a0f53ab3bb3196e505
+F src/btree.c 6f12c520c386fa56b16c2db67de6227786ca811d9c8b0e83b6a8829a10cb0d38
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 23f874642825d7eaaeeb7a3281b2b1a75e1d4c4dd9ae4dceddcd908266634214
@@ -1970,8 +1970,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 f407ec678f5bf5bfd20b7ba596472c9a85e6f21383a4cde49af1dae542fff582
-R 4b688091ccdeeb4cb2cdaf58d2c1e9de
+P 481e89c764ad8906cd21c8fbe58df57ae40bb3f261fa4892ea7ce7762786ad26
+R 8f91b5bbe0e66ec193c1dce7167d1ead
 U drh
-Z db4011ea31b9d61b51e34686f863c59f
+Z ac5b54ebdc12e737823c0b3b4f423c63
 # Remove this line to create a well-formed Fossil manifest.
index 792949b3e2634c77371b33842a0b70095165f0b3..90d509d6850341c58f560f87e16c8e5016b60a4d 100644 (file)
@@ -1 +1 @@
-481e89c764ad8906cd21c8fbe58df57ae40bb3f261fa4892ea7ce7762786ad26
\ No newline at end of file
+fe0a840805b435efd38a953a8aae60e29a35289f9d9955472a8bab2bce7051c8
\ No newline at end of file
index 7ebdec5b62f8516b99d156471a8f7f94339a7ccf..773e4cb9267af5e5d9bbe06c26e7d41e22973bbb 100644 (file)
@@ -9165,7 +9165,7 @@ int sqlite3BtreeInsert(
   TRACE(("INSERT: table=%d nkey=%lld ndata=%d page=%d %s\n",
           pCur->pgnoRoot, pX->nKey, pX->nData, pPage->pgno,
           loc==0 ? "overwrite" : "new entry"));
-  assert( pPage->isInit );
+  assert( pPage->isInit || CORRUPT_DB );
   newCell = pBt->pTmpSpace;
   assert( newCell!=0 );
   if( flags & BTREE_PREFORMAT ){