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

Fix a pager reference count leak in btree that occurs on an OOM following

a database page size change. (CVS 6875)

FossilOrigin-Name: c6dfc8bd3911b4c93969bfc13d9931965feed674
This commit is contained in:
drh
2009-07-10 16:51:30 +00:00
parent e932ba260e
commit 5e483939bc
3 changed files with 10 additions and 11 deletions

View File

@@ -1,5 +1,5 @@
C Fix\sa\sdouble-free\sthat\scan\soccur\swhen\susing\sthe\sfts3\slegacy\ssyntax\s'-'\soperator.\sAdd\stests\sfor\sthe\ssame\soperator.\sTicket\s#3960.\s(CVS\s6874)
D 2009-07-10T09:24:43
C Fix\sa\spager\sreference\scount\sleak\sin\sbtree\sthat\soccurs\son\san\sOOM\sfollowing\na\sdatabase\spage\ssize\schange.\s(CVS\s6875)
D 2009-07-10T16:51:30
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/auth.c 802a9439dfa0b8c208b10055cba400e82ef18025
F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3
F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119
F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
F src/btree.c 90b5fbf40b9f0294b23ebec71a374cf32e9ca829
F src/btree.c c331cc043d09a0549d27935ea967f15ca2e40bb7
F src/btree.h e53a10fd31d16c60a86f03c9467a6f470aa3683b
F src/btreeInt.h a568bf057aa249eb06fd31358b4393a5ac88c118
F src/build.c 867028ee9f63f7bc8eb8d4a720bb98cf9b9a12b4
@@ -740,7 +740,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
P 440c573c7e2a22f9a67a9571883e205fbadb7c11
R 832e9103a4322f20a003eefc85e64149
U danielk1977
Z fa26a29c136a6c05a174c9dac92631c9
P c19d419e8cf94a26d9bb6ad478e84841168a882e
R 900a86651c078a633f311561d3c6050e
U drh
Z 239e27b725612da3876ba9121cd3d170

View File

@@ -1 +1 @@
c19d419e8cf94a26d9bb6ad478e84841168a882e
c6dfc8bd3911b4c93969bfc13d9931965feed674

View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.673 2009/07/10 02:52:21 drh Exp $
** $Id: btree.c,v 1.674 2009/07/10 16:51:30 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -2248,8 +2248,7 @@ static int lockBtree(BtShared *pBt){
freeTempSpace(pBt);
rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize,
pageSize-usableSize);
if( rc ) goto page1_init_failed;
return SQLITE_OK;
return rc;
}
if( usableSize<480 ){
goto page1_init_failed;