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

Remove a NEVER from balance_quick() that can occur in WAL mode on

Browse Source 
a corrupt database file.

FossilOrigin-Name: b273891ab05a18b68a76c870ea3be9f1a56c40a9
This commit is contained in:
drh
2010-08-19 14:22:42 +00:00
parent e22e03e210
commit 6b47fcacb4
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Fix\stwo\sasserts\sin\sthe\sbtree\slogic\sso\sthat\sthey\swork\scorrectly\seven\sfor\nmaximum-size\sindex\sentries\sfor\s32K\sand\s64K\spages. C Remove\sa\sNEVER\sfrom\sbalance_quick()\sthat\scan\soccur\sin\sWAL\smode\son\na\scorrupt\sdatabase\sfile.
D 2010-08-18T21:19:04 D 2010-08-19T14:22:43
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -116,7 +116,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 51d83300fe0baee39405c416ceb19a58ed30a8ed F src/backup.c 51d83300fe0baee39405c416ceb19a58ed30a8ed
F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
F src/btree.c 3089d018fd27082952d79543e771f6bc8af0b0f7 F src/btree.c 69942b33b4ed4e0cc9a36b18a288839293528267
F src/btree.h b4ba2fdf6b64c7c376bdfffa826af6b786b151d9 F src/btree.h b4ba2fdf6b64c7c376bdfffa826af6b786b151d9
F src/btreeInt.h 5b034ff54800046cc5870605d683ac1f9134bd99 F src/btreeInt.h 5b034ff54800046cc5870605d683ac1f9134bd99
F src/build.c 0018d49629fc4807100c988dd191dd95e185bb38 F src/build.c 0018d49629fc4807100c988dd191dd95e185bb38
@@ -847,14 +847,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P d46567e5d75a2b9fe96d2a7a30708b2827a0d490 P e127192d106bd7e036caacf01bf7725eeaa85dbe
R d8d679ffa4745c8bf93b5e6b5825b960 R 632e7d1a1a62c66b217f6e428da8c948
U drh U drh
Z 7f378ed449a1354042bf47ceab852b72 Z 38042f7a90e879974916eb9824aa2544
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMbE5MoxKgR168RlERAm3gAJ9j3QLeVFJiXfvfSnsTlMhGqmvBSgCfTW3m iD8DBQFMbT42oxKgR168RlERAjfWAJ9X2TT9Jgt+gOAGVCXTDk2lhaURTgCfd232
v1U06YCPq+T+CyTYAg08zFE= JRi5G2mkJgNJEIZx8qN+L00=
=0zqd =sc1U
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
e127192d106bd7e036caacf01bf7725eeaa85dbe b273891ab05a18b68a76c870ea3be9f1a56c40a9

2
src/btree.c
View File

@@ -5560,7 +5560,7 @@ static int balance_quick(MemPage *pParent, MemPage *pPage, u8 *pSpace){
assert( pPage->nOverflow==1 ); assert( pPage->nOverflow==1 );
/* This error condition is now caught prior to reaching this function */ /* This error condition is now caught prior to reaching this function */
if( NEVER(pPage->nCell<=0) ) return SQLITE_CORRUPT_BKPT; if( pPage->nCell<=0 ) return SQLITE_CORRUPT_BKPT;
/* Allocate a new page. This page will become the right-sibling of /* Allocate a new page. This page will become the right-sibling of
** pPage. Make the parent page writable, so that the new divider cell ** pPage. Make the parent page writable, so that the new divider cell