Fix a buffer overrun in the atomic multifile commit logic of the pager. (CVS 1556)

FossilOrigin-Name: 3b78ffe0b5dfa20e5c638d85ed400afda8a9f948

diff --git a/manifest b/manifest
index 32b602d228aca83e8e8f1ce9ef1dc69e98baecdf..ffd981a29188a8db0fddbdcea1dbd5afba359f22 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Check\sfor\sschema\supdates\sif\sthe\sparser\sfails\sto\sfind\sa\stable.\s\sMore\slocking\ntest\supdates.\s(CVS\s1555)
-D 2004-06-10T00:29:09
+C Fix\sa\sbuffer\soverrun\sin\sthe\satomic\smultifile\scommit\slogic\sof\sthe\spager.\s(CVS\s1556)
+D 2004-06-10T00:51:44
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -47,7 +47,7 @@ F src/os_unix.c 1d6f3d1a87d4aa0e4490bcc47b3f0ff9b2e37e7a
 F src/os_unix.h 1cd6133cf66dea704b8646b70b2dfdcbdd9b3738
 F src/os_win.c 6b8f9fcc683bb888e07fc485372803baa68faadb
 F src/os_win.h 004eec47b1780fcaf07420ddc2072294b698d48c
-F src/pager.c f93d104b61278246fb06859227ac5fd87e6a67f0
+F src/pager.c d1202ce02f7033e08e84c270106fbe688dcf42cd
 F src/pager.h ca8f293e1d623a7c628a1c5e0c6cf43d5bbb80bf
 F src/parse.y 097438674976355a10cf177bd97326c548820b86
 F src/pragma.c 3251628662963f30a95133b19d59e4bc08226c76
@@ -218,7 +218,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 73afa14a04e8aa22de71aac7d08abc0ec68dc327
-R 4a457b2bb951374d999015f4602a5043
+P a22283512afe2df09d5783d189fbd7389ed313ad
+R 44c0fe57aaff3fee6a9e59ee85ca7073
 U drh
-Z 0642bdc31cc4198c64ee7082ebf04a73
+Z e14cb70585259da837e18dc09e5b8e61

diff --git a/manifest.uuid b/manifest.uuid
index ff03c08d75adb7490cfcb8a91da1687bff7677dd..6667cbaf8470ee25ae6ffb989b483b5f912c2752 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a22283512afe2df09d5783d189fbd7389ed313ad
\ No newline at end of file
+3b78ffe0b5dfa20e5c638d85ed400afda8a9f948
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 814d7d6f16df56940c7e08d5c3ad779d5639aa49..e9269f8130bae870483301ac184d106f3dd3b202 100644 (file)
--- 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.117 2004/06/09 20:03:09 drh Exp $
+** @(#) $Id: pager.c,v 1.118 2004/06/10 00:51:44 drh Exp $
 */
 #include "os.h"         /* Must be first to enable large file support */
 #include "sqliteInt.h"
@@ -809,7 +809,7 @@ static int pager_playback(Pager *pPager, int useJournalSize){
       rc = SQLITE_NOMEM;
       goto end_playback;
     }
-    rc = sqlite3OsRead(&pPager->jfd, zMaster, pPager->nMaster);
+    rc = sqlite3OsRead(&pPager->jfd, zMaster, nMaster);
     if( rc!=SQLITE_OK || (zMaster[0] && !sqlite3OsFileExists(zMaster)) ){
       goto end_playback;
     }