From da8c8f2f8f9b44f18109f985a166e7ee3727f103 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Mon, 7 Jul 2008 18:42:40 +0000 Subject: [PATCH] Fix an error introduced by (5346). The list could become corrupted when the database was truncated. (CVS 5356) FossilOrigin-Name: fbd320ed27dc8910f5035b41171576b4a37cb8b9 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/pager.c | 5 ++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index efe5581cc4..b77e3466af 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\sin\sshared_err.test\spreventing\sit\sfrom\srunning\sproperly\sand\sadd\sa\stest\sto\scorrupt2.test\sto\scover\sanother\scorruption\sdetection\scase.\s(CVS\s5355) -D 2008-07-07T17:55:29 +C Fix\san\serror\sintroduced\sby\s(5346).\sThe\slist\scould\sbecome\scorrupted\swhen\sthe\sdatabase\swas\struncated.\s(CVS\s5356) +D 2008-07-07T18:42:41 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -133,7 +133,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60 F src/os_os2.c 38fd8cfb1c122c39e451d9f3e779c602283dba33 F src/os_unix.c 3d19f0491e0b32e5b757c7e6f310f2f6d3aea3f4 F src/os_win.c 2bf2f8cd700299564cc236262c2668e1e02c626a -F src/pager.c 4c4d0529a6546fda09e5703d4d3ec302c322fd6d +F src/pager.c a3a916b7215bbdc973e231cde66aaa23871a9072 F src/pager.h 6aa3050a3c684475a5a9dbad5ff1cebad612acba F src/parse.y 8c2c3145eebe1964eb279cb3c4e502eae28bb0fa F src/pragma.c 9a95f5b3708f6d3ddd987eab5f369a19ffcb6795 @@ -598,7 +598,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P eae4105d8a162ba80ca6fde40ae24fdc6c3eccdf -R f496c8d0640042a91d4ade70336ad198 +P 2dcd5287a0d71140baa23aae2ab3d95d78a5676d +R 632ef97e2e5d19875351e0367da22299 U danielk1977 -Z 30d3aab86bc5b9f928dd05214faf5bdf +Z 77dc7b2edaf1d1ebf4af6323571db8ad diff --git a/manifest.uuid b/manifest.uuid index b7eb689c16..55643bb543 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2dcd5287a0d71140baa23aae2ab3d95d78a5676d \ No newline at end of file +fbd320ed27dc8910f5035b41171576b4a37cb8b9 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index ab1ae0745a..755e279f11 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.461 2008/07/07 11:18:28 danielk1977 Exp $ +** @(#) $Id: pager.c,v 1.462 2008/07/07 18:42:41 danielk1977 Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -2651,6 +2651,9 @@ static void pager_truncate_cache(Pager *pPager){ ppPg = &pPg->pNextAll; }else{ *ppPg = pPg->pNextAll; + if( *ppPg ){ + (*ppPg)->pPrevAll = pPg->pPrevAll; + } IOTRACE(("PGFREE %p %d\n", pPager, pPg->pgno)); PAGER_INCR(sqlite3_pager_pgfree_count); unlinkPage(pPg);