Further improvements (subsequent to [d91450847a3a3a72]) to handling of attempts

to delete a journal using the memdb VFS.
dbsqlfuzz ac61dab357279a6a531de067f040e9a4828d2df0.

FossilOrigin-Name: a0839406426a0d8ec52cc3116ea7d8b582344b44f3f8c9365bbf5187370c3386

2 files changed, 2 insertions, 2 deletions

diff --git a/src/os.c b/src/os.c
index 693d78dc9..b11c49c1d 100644
--- a/src/os.c
+++ b/src/os.c
@@ -229,7 +229,7 @@ int sqlite3OsOpen(
 int sqlite3OsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
   DO_OS_MALLOC_TEST(0);
   assert( dirSync==0 || dirSync==1 );
-  return pVfs->xDelete(pVfs, zPath, dirSync);
+  return pVfs->xDelete!=0 ? pVfs->xDelete(pVfs, zPath, dirSync) : SQLITE_OK;
 }
 int sqlite3OsAccess(
   sqlite3_vfs *pVfs,
diff --git a/src/pager.c b/src/pager.c
index 811863252..be06a8a27 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -7327,7 +7327,7 @@ int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
           assert( rc==SQLITE_OK );
           rc = pagerLockDb(pPager, RESERVED_LOCK);
         }
-        if( rc==SQLITE_OK && pPager->pVfs->xDelete!=0 ){
+        if( rc==SQLITE_OK ){
           sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
         }
         if( rc==SQLITE_OK && state==PAGER_READER ){