Fix two faulty assert statements discovered by fuzzing.

FossilOrigin-Name: 799817bfb2bc95963c0e0d70063c4cb15c94ef74

diff --git a/manifest b/manifest
index debf5f12bdc411dbeb14e3abb425d910ff9c6599..b06174bcb659165d57804ebb3f5916476f2053ea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert\sin\sbtree.c\sthat\scan\sbe\sfalse\swhen\susing\sa\scorrupted\sdatabase\nfile.
-D 2015-05-22T12:37:37.573
+C Fix\stwo\sfaulty\sassert\sstatements\sdiscovered\sby\sfuzzing.
+D 2015-05-22T13:09:50.891
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
 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 dbc8f9207278c109c3f38c9dc5f550c8bb5080d8
+F src/btree.c 0eb4eb39e75be6170f1e59f7d6aabedaefb19938
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
 F src/build.c d5d9090788118178190c5724c19f93953b8c7a4e
@@ -210,7 +210,7 @@ F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
 F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
 F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
-F src/insert.c 8176ba5bad8fcef643558ca5708f33ed05a4035a
+F src/insert.c 35b7816918406ec49fbcc6c7fa7ab622597f662e
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@ -1278,7 +1278,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 c6d5512f4b8b1237fa4cf5f3f2eae19b160bcf26
-R b9e753c0683555ed773ae3f4504e148b
+P a6eb2a39357c35dc13d549ef86c785ff5c69938a
+R d9917d1c8ed4ffaff7f5ca236b5ad758
 U drh
-Z f51f66c2118a09b9970e631fa314a714
+Z d8611b43fb13ded0a9ff190ab5f2029c

diff --git a/manifest.uuid b/manifest.uuid
index a98c44dfeb33afb8c807bc78e0da0c3edb2e6901..d18f783771b2e2e3c23fda3b00c816ff93f763bc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a6eb2a39357c35dc13d549ef86c785ff5c69938a
\ No newline at end of file
+799817bfb2bc95963c0e0d70063c4cb15c94ef74
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 5e561cbcf456a388529cd1c1d6b8b1ba740eebf9..6b7da394ac9529f0f2b93c1e334a80374ec89922 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -8011,7 +8011,8 @@ static int clearDatabasePage(
     rc = clearDatabasePage(pBt, get4byte(&pPage->aData[hdr+8]), 1, pnChange);
     if( rc ) goto cleardatabasepage_out;
   }else if( pnChange ){
-    assert( pPage->intKey );
+    assert( pPage->intKey || CORRUPT_DB );
+    testcase( !pPage->intKey );
     *pnChange += pPage->nCell;
   }
   if( freePageFlag ){

diff --git a/src/insert.c b/src/insert.c
index c794ae4f5672ea3083076ccc179cb93a7cb43505..18dbfed8b28cb64e4bc8f9b8cca2e0c085e30646 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -42,7 +42,7 @@ void sqlite3OpenTable(
   }else{
     Index *pPk = sqlite3PrimaryKeyIndex(pTab);
     assert( pPk!=0 );
-    assert( pPk->tnum=pTab->tnum );
+    assert( pPk->tnum==pTab->tnum );
     sqlite3VdbeAddOp3(v, opcode, iCur, pPk->tnum, iDb);
     sqlite3VdbeSetP4KeyInfo(pParse, pPk);
     VdbeComment((v, "%s", pTab->zName));