mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reinstate an assert() by adding an "|| CORRUPT_DB" term.

Browse Source 
FossilOrigin-Name: 95ce20348d9b868a0407adccdb222a0e4c762945
This commit is contained in:
drh 2014-12-29 11:50:39 +00:00
parent 277b4e446c
commit 622a53d54a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\sthe\s"checksymbols"\starget\sin\sMakefile.in\sso\sthat\sit\sactually\sworks.\nEnhance\sthe\sreleasetest.tcl\sscript\sto\scount\sthe\stotal\snumber\sof\stests\nrun\sover\sall\sconfigurations. C Reinstate\san\sassert()\sby\sadding\san\s"||\sCORRUPT_DB"\sterm.
D 2014-12-29T02:55:58.026 D 2014-12-29T11:50:39.465
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 40326b6d788007dd5e00587c54adcd2621832bb3 F Makefile.in 40326b6d788007dd5e00587c54adcd2621832bb3
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -301,7 +301,7 @@ F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
F src/vdbesort.c c150803a3e98fbc68bd07772cbbd4328a0a7212d F src/vdbesort.c c150803a3e98fbc68bd07772cbbd4328a0a7212d
F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9 F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
F src/wal.c 847692349eb6e1fb8543dbc97e69ddbfa4cc7ea7 F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1 F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
@ -1234,7 +1234,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 0dfef6757056ef0bdea8f049f7469ccf6960e2cb P 4eda1c746043acbdb7ef3e1f95bf8b01ee976479
R 74cab324b9af5a87ce922fe9e97d1a6b R 110d8f73632ac0551fa4d638f24a9811
U drh U drh
Z 3ab79c0378fea7c029a9124c0c9f4912 Z b99a612326485f12a8c134680408ea8b

2
manifest.uuid
View File

@ -1 +1 @@
4eda1c746043acbdb7ef3e1f95bf8b01ee976479 95ce20348d9b868a0407adccdb222a0e4c762945

2
src/wal.c
View File

@ -2412,7 +2412,7 @@ int sqlite3WalFindFrame(
for(iKey=walHash(pgno); aHash[iKey]; iKey=walNextHash(iKey)){ for(iKey=walHash(pgno); aHash[iKey]; iKey=walNextHash(iKey)){
u32 iFrame = aHash[iKey] + iZero; u32 iFrame = aHash[iKey] + iZero;
if( iFrame<=iLast && aPgno[aHash[iKey]]==pgno ){ if( iFrame<=iLast && aPgno[aHash[iKey]]==pgno ){
/* assert( iFrame>iRead ); -- not true if there is corruption */ assert( iFrame>iRead || CORRUPT_DB );
iRead = iFrame; iRead = iFrame;
} }
if( (nCollide--)==0 ){ if( (nCollide--)==0 ){