From 9d69662001f2cffbff140cfb9549c09b73ffff7d Mon Sep 17 00:00:00 2001 From: krcroft Date: Thu, 16 Jan 2020 14:31:40 -0800 Subject: [PATCH] Fix NULL issues in drive-related code --- src/dos/drive_cache.cpp | 3 ++- src/dos/drive_fat.cpp | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/dos/drive_cache.cpp b/src/dos/drive_cache.cpp index fd11f142..b0ece980 100644 --- a/src/dos/drive_cache.cpp +++ b/src/dos/drive_cache.cpp @@ -876,8 +876,9 @@ bool DOS_Drive_Cache::ReadDir(Bit16u id, char* &result) { LOG_DEBUG(buffer); };*/ }; - if (SetResult(dirSearch[id], result, dirSearch[id]->nextEntry)) return true; if (dirSearch[id]) { + if (SetResult(dirSearch[id], result, dirSearch[id]->nextEntry)) + return true; dirSearch[id]->id = MAX_OPENDIRS; dirSearch[id] = nullptr; } diff --git a/src/dos/drive_fat.cpp b/src/dos/drive_fat.cpp index 975064c9..026e4e17 100644 --- a/src/dos/drive_fat.cpp +++ b/src/dos/drive_fat.cpp @@ -753,10 +753,6 @@ fatDrive::fatDrive(const char *sysFilename, /* Load disk image */ loadedDisk.reset(new imageDisk(diskfile, sysFilename, filesize, is_hdd)); - if(!loadedDisk) { - created_successfully = false; - return; - } if(is_hdd) { /* Set user specified harddrive parameters */