diff --git a/manifest b/manifest index c04c24a048..1f2b989619 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Return\san\sSQLITE_CORRUPT\serror\sif\sthe\sfinal\sexpected\ssize\sof\sthe\sdatabase\swhen\scheckpointing\sis\snot\sreasonable\s-\swhere\sreasonable\sis\sdefined\s(basically)\sas\sthe\ssum\sof\sthe\ssizes\sof\sthe\sdatabase\sand\swal\sfiles. -D 2020-08-07T16:28:02.482 +C Fix\sa\sfile-descriptor\sleak\sin\stest\sscript\scorruptL.test. +D 2020-08-07T18:52:03.495 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -783,7 +783,7 @@ F test/corruptH.test 79801d97ec5c2f9f3c87739aa1ec2eb786f96454 F test/corruptI.test a17bbf54fdde78d43cf3cc34b0057719fd4a173a3d824285b67dc5257c064c7b F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4 F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af -F test/corruptL.test e32d0bea4292393cb4f756796e1c244d5f58a094efb4d8b4562bf054deba4e89 +F test/corruptL.test a908e3dcc7615548fcd656a002f265d192286df95d2252a7a1bcfe9e6a79829d F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067 F test/cost.test 1d156ce9858780a966c062694687afe0343a0ed12d081d071fb57027e726bafc F test/count.test e0699a15712bc2a4679d60e408921c2cce7f6365a30340e790c98e0f334a9c77 @@ -1879,7 +1879,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 4cffa9bb44d6f0bdb23cae913adfb224f0814e65a2abb9120179f0b288e70f77 -R ef8f7de6d7c8f341172764fb53b9c16f +P e2799563c8a97f617c6d932719b312e3d5bff051a9a397492df8d88e8bb4260a +R 65a12f21cdfb44bf0e71fb1b5d1ff4e4 U dan -Z d788ae4d9c746ea7a66e040d2a4caab4 +Z 9fe4a565eac614ec216cb99d3a46f95e diff --git a/manifest.uuid b/manifest.uuid index f77ae79172..bebb222d2a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e2799563c8a97f617c6d932719b312e3d5bff051a9a397492df8d88e8bb4260a \ No newline at end of file +ec2c340c39bc78e4bce0eb01ea408c95ba121103cc77f300f29f3001fc345c20 \ No newline at end of file diff --git a/test/corruptL.test b/test/corruptL.test index 1e45f2970e..6cbc3fb48e 100644 --- a/test/corruptL.test +++ b/test/corruptL.test @@ -1295,6 +1295,11 @@ do_catchsql_test 16.1 { } {1 {database disk image is malformed}} #------------------------------------------------------------------------- +# Test that corruption is reported from within a checkpoint if the +# expected final size of the database (according to the last commit +# frame in the wal file) is greater than the combined initial sizes +# of the database and wal file. +# reset_db do_execsql_test 17.0 { CREATE TABLE t1(o INTEGER PRIMARY KEY, t UNIQUE); @@ -1316,10 +1321,13 @@ do_test 17.1 { file size test.db } {2048} -breakpoint -do_catchsql_test 17.1 { +do_catchsql_test 17.2 { PRAGMA wal_checkpoint } {1 {database disk image is malformed}} +do_test 17.3 { + close $fd +} {} + finish_test