The assert() changes removed in the previous check-in are needed after all.

FossilOrigin-Name: 336fccc84cd7b770c9c3720efc9976269096232e

diff --git a/manifest b/manifest
index efb6a270655a2d5777d0a959a7162d1e02d82879..d70b8c3133c9e2f75cbe9913834f166db47b2c69 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Better\sdetection\sof\scorruption\sin\sallocateSpace()\sin\sbtree.c.
-D 2015-05-24T21:09:52.026
+C The\sassert()\schanges\sremoved\sin\sthe\sprevious\scheck-in\sare\sneeded\safter\sall.
+D 2015-05-24T21:46:03.216
 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 17776a0c3ad27326a9067bdc4ddea2a0a2230581
+F src/btree.c 148cbc4387f30f8082a32d0f7a07ea602db80945
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
 F src/build.c d5d9090788118178190c5724c19f93953b8c7a4e
@@ -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 4f0bba42f904e505900be67b00179ebb1f24ed03
-R 8242f5320e3965af2649b2d97c4412ed
+P bf7bb53ee2485a5342916d514d6c7291eb84c5f1
+R 5e364b393c6eb63740625ffdfee0a54c
 U drh
-Z 757528b0ed7a78b958475a4239ae8625
+Z 28bcb31cd760dbdf61ef36939d443ca6

diff --git a/manifest.uuid b/manifest.uuid
index b6c71b9ba99c4ed1c7e98a599fc9e124a221da28..89894fef02338cc3108bf00e2aede59a6d6e2a04 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bf7bb53ee2485a5342916d514d6c7291eb84c5f1
\ No newline at end of file
+336fccc84cd7b770c9c3720efc9976269096232e
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a418a0ec7f5679b8d71687f8e821362f52d57edf..71bc425a4cf8538dd5f6f31c736ac99143a00f17 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -6169,7 +6169,8 @@ static void rebuildPage(
     memcpy(pData, pCell, szCell[i]);
     put2byte(pCellptr, (pData - aData));
     pCellptr += 2;
-    assert( szCell[i]==cellSizePtr(pPg, pCell) );
+    assert( szCell[i]==cellSizePtr(pPg, pCell) || CORRUPT_DB );
+    testcase( szCell[i]==cellSizePtr(pPg,pCell) );
   }
 
   /* The pPg->nFree field is now set incorrectly. The caller will fix it. */