database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

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

Browse Source 
FossilOrigin-Name: 336fccc84cd7b770c9c3720efc9976269096232e
This commit is contained in:
drh
2015-05-24 21:46:03 +00:00
parent 0b538f2a81
commit 7ca0954c2c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Better\sdetection\sof\scorruption\sin\sallocateSpace()\sin\sbtree.c. C The\sassert()\schanges\sremoved\sin\sthe\sprevious\scheck-in\sare\sneeded\safter\sall.
D 2015-05-24T21:09:52.026 D 2015-05-24T21:46:03.216
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -192,7 +192,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d
F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
F src/btree.c 17776a0c3ad27326a9067bdc4ddea2a0a2230581 F src/btree.c 148cbc4387f30f8082a32d0f7a07ea602db80945
F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
F src/build.c d5d9090788118178190c5724c19f93953b8c7a4e F src/build.c d5d9090788118178190c5724c19f93953b8c7a4e
@@ -1278,7 +1278,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 4f0bba42f904e505900be67b00179ebb1f24ed03 P bf7bb53ee2485a5342916d514d6c7291eb84c5f1
R 8242f5320e3965af2649b2d97c4412ed R 5e364b393c6eb63740625ffdfee0a54c
U drh U drh
Z 757528b0ed7a78b958475a4239ae8625 Z 28bcb31cd760dbdf61ef36939d443ca6

2
manifest.uuid
View File

@@ -1 +1 @@
bf7bb53ee2485a5342916d514d6c7291eb84c5f1 336fccc84cd7b770c9c3720efc9976269096232e

3
src/btree.c
View File

@@ -6169,7 +6169,8 @@ static void rebuildPage(
memcpy(pData, pCell, szCell[i]); memcpy(pData, pCell, szCell[i]);
put2byte(pCellptr, (pData - aData)); put2byte(pCellptr, (pData - aData));
pCellptr += 2; 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. */ /* The pPg->nFree field is now set incorrectly. The caller will fix it. */