Fix a faulty assert() in btree.c. Update the database fuzz test file with

new test cases.

FossilOrigin-Name: 4e621af1345a001360938de76e3b0a14deb5e991

diff --git a/manifest b/manifest
index 879a00fb946a380d2843fc52f9d5b9d2269430e5..84ea37edf4dff89a4ae925766efc018e8a9211c2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Corrections\sto\scomments\sin\sexpr.c.\s\sNo\scode\schanges.
-D 2015-06-01T18:13:16.094
+C Fix\sa\sfaulty\sassert()\sin\sbtree.c.\s\sUpdate\sthe\sdatabase\sfuzz\stest\sfile\swith\nnew\stest\scases.
+D 2015-06-02T14:02:18.322
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 994bab32a3a69e0c35bd148b65cde49879772964
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -192,7 +192,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c 9e837a0e7e35c54bedddf55db906b7902d175078
+F src/btree.c c73a170115df068764126a85288cdec092ec180c
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
 F src/build.c 85a169a0a22f8b80caf513eaf2944d39b979f571
@@ -655,7 +655,7 @@ F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
 F test/fuzzcheck.c a60f926e3fa86c8d33908406d75eec868c22b9ca
 F test/fuzzdata1.db b60254eeb6bc11474071b883059662a73c48da7f
 F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
-F test/fuzzdata3.db 2701a08185d24d8570eb6e765201131fe75eff84
+F test/fuzzdata3.db 3632e598ff8574228aadf09897bd040d3c5f5ffb
 F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36
 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -1281,7 +1281,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9b8e5823bccf69f5cdedd8655e75df6e9718b809
-R 79c21798380eea59e3e40be5d7ba64b0
+P f925389eaf5bf8962a28fcaa652b75caa606efba
+R ae4a37b7f156067ca4ef803074aa5dc0
 U drh
-Z 59ba12ae4d822d8c7d37e1e41f2f9dfd
+Z d6aea5d5b820e4f6ddc306cbfe7d28b3

diff --git a/manifest.uuid b/manifest.uuid
index f27f0a326096ebb165e7f145d7c5bfb5daa64158..a97991bf5c72145835f94c34f8c6acf9a40f7282 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f925389eaf5bf8962a28fcaa652b75caa606efba
\ No newline at end of file
+4e621af1345a001360938de76e3b0a14deb5e991
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index cc97dc6b1f3ca4c4bd11f38c7139cd5bd87faa7d..c81059f5b4df1bea9718f372951e5bdf25d7b9c2 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -6141,9 +6141,9 @@ static void insertCell(
     ins = cellOffset + 2*i;
     rc = allocateSpace(pPage, sz, &idx);
     if( rc ){ *pRC = rc; return; }
-    /* The allocateSpace() routine guarantees the following two properties
-    ** if it returns success */
-    assert( idx >= end+2 );
+    /* The allocateSpace() routine guarantees the following properties
+    ** if it returns successfully */
+    assert( idx >= 0 && (idx >= end+2 || CORRUPT_DB) );
     assert( idx+sz <= (int)pPage->pBt->usableSize );
     pPage->nCell++;
     pPage->nFree -= (u16)(2 + sz);

diff --git a/test/fuzzdata3.db b/test/fuzzdata3.db
index 197654a9f688a21b70c977dc4d03a63dd13491bd..376459f2d624ff28e69b8f0b3892e89d2fc43c88 100644 (file)
Binary files a/test/fuzzdata3.db and b/test/fuzzdata3.db differ