From: dan <dan@noemail.net>
Date: Thu, 10 Sep 2009 18:04:02 +0000 (+0000)
Subject: Fix a problem in test script corrupt.test.
X-Git-Tag: fts3-refactor~192
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59d60c2cac9d39ef42506aeb305d4f2d6618104f;p=thirdparty%2Fsqlite.git

Fix a problem in test script corrupt.test.

FossilOrigin-Name: dad2b74ad0a86ff07c77f0a60b26480fc0a2e54d
---

diff --git a/manifest b/manifest
index 92eba45d9a..d443b4c1e6 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Add\sassert()\sstatement\sto\sverify\sthat\snew\smutexes\sare\snot\sallocated\swhen\nthe\smutex\ssubsystem\sis\suninitialized.
-D 2009-09-10T17:45:00
+C Fix\sa\sproblem\sin\stest\sscript\scorrupt.test.
+D 2009-09-10T18:04:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -286,7 +283,7 @@ F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
 F test/colmeta.test 087c42997754b8c648819832241daf724f813322
 F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
 F test/conflict.test 0ed68b11f22721052d880ee80bd528a0e0828236
-F test/corrupt.test f89c25681f60e06631e5cb203d06622f2f84e1e9
+F test/corrupt.test f47f220959b40f79f30c4271eefcec0587e984e3
 F test/corrupt2.test a571e30ea4e82318f319a24b6cc55935ce862079
 F test/corrupt3.test 263e8bb04e2728df832fddf6973cf54c91db0c32
 F test/corrupt4.test acdb01afaedf529004b70e55de1a6f5a05ae7fff
@@ -753,14 +750,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b3027863505fa8edf355f3f5eea4502ef365175e
-R 08804fe3d59d9c44cb7b080e511dfef2
-U drh
-Z 0e4a69ed44dd7c7502a8c79038532167
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFKqTsgoxKgR168RlERAn1TAJ9uG3gx/c3HhgDhOPqRUn7M66SIOwCggh6Q
-/YiheptxazPExELwQLXw9SU=
-=OssI
------END PGP SIGNATURE-----
+P 1183c533571bc9c7ce56102b718f3e4f4e78019e
+R 03fa6a3f6ce1e39814b293b8995caaa2
+U dan
+Z 489054e207307dd18023a14238993ba1
diff --git a/manifest.uuid b/manifest.uuid
index 3235cec167..3d56e28453 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1183c533571bc9c7ce56102b718f3e4f4e78019e
\ No newline at end of file
+dad2b74ad0a86ff07c77f0a60b26480fc0a2e54d
\ No newline at end of file
diff --git a/test/corrupt.test b/test/corrupt.test
index ad7fa3bdab..16f1a92169 100644
--- a/test/corrupt.test
+++ b/test/corrupt.test
@@ -226,6 +226,9 @@ do_test corrupt-5.2 {
   catchsql { SELECT * FROM sqlite_master }
 } {1 {database disk image is malformed}}
 
+# At one point, the specific corruption caused by this test case was
+# causing a buffer overwrite. Although a crash was never demonstrated,
+# running this testcase under valgrind revealed the problem.
 do_test corrupt-6.1 {
   db close
   file delete -force test.db test.db-journal
@@ -252,6 +255,6 @@ do_test corrupt-6.1 {
   sqlite3 db test.db 
 
   catchsql { INSERT INTO t1 VALUES( randomblob(10) ) }
-} {}
+} {1 {database disk image is malformed}}
 
 finish_test