Fix a bug that can cause a segfault on win32 systems following an

I/O error. (CVS 4565)

FossilOrigin-Name: eeec8d27c4533f62b4f7e739d9c895552ddb69ff

diff --git a/manifest b/manifest
index edab542e56c9fc67a559e349343a9610df446293..0103da15384e0ec4f3d6edab31163787234c438d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bug\sfix\sin\sthe\sconfigure\sscript.\s\sTicket\s#2799.\nThe\sconfigure\sscript\sis\sa\sreal\smess\sand\nneeds\sto\sbe\scompletely\srewritten.\s(CVS\s4564)
-D 2007-11-27T14:50:07
+C Fix\sa\sbug\sthat\scan\scause\sa\ssegfault\son\swin32\ssystems\sfollowing\san\nI/O\serror.\s(CVS\s4565)
+D 2007-11-27T16:55:08
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 35396fd58890420b29edcf27b6c0e2d054862a6b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -122,7 +122,7 @@ F src/os_unix.c db6755454c84004d0041eb1b2194c90b35db0a5b
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 1fb40eb62fb0719ea578d69edcb1a2974f04d214
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c c5ffa55c299663b579fbcb430752c1e79d302c5b
+F src/pager.c b1eaca429cf9a4e35bed12f6f326d39a82ee8a33
 F src/pager.h d783e7f184afdc33adff37ba58d4e029bd8793b3
 F src/parse.y a780b33ef45dd7b3272319cf91e609d6f109a31c
 F src/pragma.c cb1486e76dbcad757968afc4083d3472032e62b5
@@ -592,7 +592,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P f4c8f2d1918f24514f02cae9172c77f6957d32c1
-R bbaa02b7395da923c226aeaf46587efc
+P 9d15f0330d685e62fbf4a1a1ad18dfecdc511bf8
+R 089796694c6a301d0c6f684ee346f02f
 U drh
-Z 56eefc0d674544da0d9f5e22b963fd17
+Z 100037c53ee3474c3899859b5b1319f4

diff --git a/manifest.uuid b/manifest.uuid
index fa2d780af5f93fe8dabce8345634f15b4fc221f4..2a7f4c229cf9fdeae020acddbb631a63d11e04cc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d15f0330d685e62fbf4a1a1ad18dfecdc511bf8
\ No newline at end of file
+eeec8d27c4533f62b4f7e739d9c895552ddb69ff
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index b2f934d1d2382a4b5f47a71813d8d40d53f4c3bf..54910ffaf94b773650941c8c3533be88b7a1641f 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.394 2007/11/05 15:30:13 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.395 2007/11/27 16:55:08 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -3007,6 +3007,7 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){
 static int hasHotJournal(Pager *pPager){
   sqlite3_vfs *pVfs = pPager->pVfs;
   if( !pPager->useJournal ) return 0;
+  if( !pPager->fd->pMethods ) return 0;
   if( !sqlite3OsAccess(pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS) ){
     return 0;
   }