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

Ensure that the "Any prior cache entry associated with newKey is guaranteed not to be pinned" guarantee made to xRekey implementations is not violated.

Browse Source 
FossilOrigin-Name: ecc3544e712041736af7c7b4f34864a1f2e30ff7
This commit is contained in:
dan 2014-10-24 20:57:03 +00:00
parent 23eba45d23
commit 31f4e99d44
4 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Fix\ssome\sissues\sin\sthe\snew\scode\son\sthis\sbranch\srelated\sto\sthe\shandling\sof\scorrupt\sdatabases. C Ensure\sthat\sthe\s"Any\sprior\scache\sentry\sassociated\swith\snewKey\sis\sguaranteed\snot\sto\sbe\spinned"\sguarantee\smade\sto\sxRekey\simplementations\sis\snot\sviolated.
D 2014-10-24T18:43:57.313 D 2014-10-24T20:57:03.500
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -172,7 +172,7 @@ F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5 F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
F src/btree.c df15daf116e9ef1a7ff88257f6fb678ba385b5ea F src/btree.c 4decfb3b97d16afdd0e5a7e5f876af1f528e8a69
F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8 F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179 F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919 F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
@ -215,7 +215,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7 F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
F src/os_win.c a019caaae2bcbbc0cc4c39af6e7d7e43d8426053 F src/os_win.c a019caaae2bcbbc0cc4c39af6e7d7e43d8426053
F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
F src/pager.c d02833adf331a5913226595306d64731a3da33f6 F src/pager.c 8d97b3633f098fef817656dcbf167ca904511d78
F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b
F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45 F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
@ -1205,7 +1205,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 eab8706dc47aa0a44caf73619de858397c3e0b4e P 19736dd9fbbb7e252c4f8715e2277d48ac41f5bc
R 8a34c36d0ed8bbbc0bb7360d0dc30d47 R c9d1872515b77329bc9fbfe4c8e91668
U dan U dan
Z 610a2814ec6cdf214c41e43dd2355678 Z 931e363227b1144b3ac19bee87a82036

2
manifest.uuid
View File

@ -1 +1 @@
19736dd9fbbb7e252c4f8715e2277d48ac41f5bc ecc3544e712041736af7c7b4f34864a1f2e30ff7

30
src/btree.c
View File

@ -6856,25 +6856,19 @@ static int balance_nonroot(
aPgFlags[i] = apNew[i]->pDbPage->flags; aPgFlags[i] = apNew[i]->pDbPage->flags;
} }
for(i=0; i<nNew; i++){ for(i=0; i<nNew; i++){
Pgno iGt = (i==0 ? 0 : apNew[i-1]->pgno); int iBest = 0; /* aPgno[] index of page number to use */
Pgno iMin = 0; Pgno pgno; /* Page number to use */
u16 flags = 0; for(j=1; j<nNew; j++){
for(j=0; j<nNew; j++){ if( aPgno[j]<aPgno[iBest] ) iBest = j;
Pgno iPgno = aPgno[j];
if( iPgno>iGt && (iMin==0 || iPgno<iMin) ){
iMin = iPgno;
flags = aPgFlags[j];
}
} }
if( iMin==0 ){ pgno = aPgno[iBest];
/* This case can only occur if aPgno[] contains duplicate page aPgno[iBest] = 0xffffffff;
** numbers. Which can only happen if the database is corrupt. */ if( iBest!=i ){
assert( CORRUPT_DB ); if( iBest>i ){
rc = SQLITE_CORRUPT_BKPT; sqlite3PagerRekey(apNew[iBest]->pDbPage, pBt->nPage+iBest+1, 0);
goto balance_cleanup; }
}else if( apNew[i]->pgno!=iMin ){ sqlite3PagerRekey(apNew[i]->pDbPage, pgno, aPgFlags[iBest]);
sqlite3PagerRekey(apNew[i]->pDbPage, iMin, flags); apNew[i]->pgno = pgno;
apNew[i]->pgno = iMin;
} }
} }

5
src/pager.c
View File

@ -6853,10 +6853,7 @@ int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, int isCommit){
** page number to iNew and sets the value of the PgHdr.flags field to ** page number to iNew and sets the value of the PgHdr.flags field to
** the value passed as the third parameter. ** the value passed as the third parameter.
*/ */
void sqlite3PagerRekey(DbPage *pPage, Pgno iNew, u16 flags){ void sqlite3PagerRekey(DbPage *pPg, Pgno iNew, u16 flags){
PgHdr *pPg = (PgHdr*)pPage;
assert( (flags & PGHDR_DIRTY) && (pPg->flags & PGHDR_DIRTY) );
assert( !subjRequiresPage(pPg) );
assert( pPg->pgno!=iNew ); assert( pPg->pgno!=iNew );
pPg->flags = flags; pPg->flags = flags;
sqlite3PcacheMove(pPg, iNew); sqlite3PcacheMove(pPg, iNew);