Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-30 09:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Floppy/Harddisk images: on failure, close handle for all return paths. (Fixes #1227)

Browse Source
This commit is contained in:
tomcw 2024-08-17 16:14:09 +01:00
parent 1127447a10
commit 4786de0cc7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/DiskImage.cpp
View File

@ -68,18 +68,23 @@ ImageError_e ImageOpen( const std::string & pszImageFilename,
if (pImageInfo->pImageType && pImageInfo->pImageType->GetType() == eImageHDV)
{
if (bExpectFloppy)
{
ImageClose(*ppImageInfo);
*ppImageInfo = NULL;
Err = eIMAGE_ERROR_UNSUPPORTED_HDV;
}
return Err;
}
// THE FILE MATCHES A KNOWN FORMAT
_ASSERT(bExpectFloppy);
if (!bExpectFloppy)
return eIMAGE_ERROR_UNSUPPORTED;
if (!pImageInfo->uNumTracks)
if (!bExpectFloppy || !pImageInfo->uNumTracks)
{
ImageClose(*ppImageInfo);
*ppImageInfo = NULL;
return eIMAGE_ERROR_UNSUPPORTED;
}
*pWriteProtected = pImageInfo->bWriteProtected;