Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-06 03:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix a few medium Coverity defects:

Browse Source 
1514566, 1063811
This commit is contained in:
tomcw 2022-02-26 20:23:00 +00:00
parent 707993b686
commit c277c5152d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Memory.cpp
View File

@ -1757,8 +1757,8 @@ void MemInitializeFromSnapshot(void)
if (IsApple2PlusOrClone(GetApple2Type()) && (GetCardMgr().QuerySlot(SLOT3) == CT_VidHD)) if (IsApple2PlusOrClone(GetApple2Type()) && (GetCardMgr().QuerySlot(SLOT3) == CT_VidHD))
{ {
VidHDCard* vidHD = dynamic_cast<VidHDCard*>(GetCardMgr().GetObj(SLOT3)); VidHDCard& vidHD = dynamic_cast<VidHDCard&>(GetCardMgr().GetRef(SLOT3));
memVidHD = vidHD->IsWriteAux() ? memaux : NULL; memVidHD = vidHD.IsWriteAux() ? memaux : NULL;
} }
} }
@ -2026,9 +2026,9 @@ BYTE __stdcall MemSetPaging(WORD programcounter, WORD address, BYTE write, BYTE
{ {
if (GetCardMgr().QuerySlot(SLOT3) == CT_VidHD) if (GetCardMgr().QuerySlot(SLOT3) == CT_VidHD)
{ {
VidHDCard* vidHD = dynamic_cast<VidHDCard*>(GetCardMgr().GetObj(SLOT3)); VidHDCard& vidHD = dynamic_cast<VidHDCard&>(GetCardMgr().GetRef(SLOT3));
vidHD->VideoIOWrite(programcounter, address, write, value, nExecutedCycles); vidHD.VideoIOWrite(programcounter, address, write, value, nExecutedCycles);
memVidHD = vidHD->IsWriteAux() ? memaux : NULL; memVidHD = vidHD.IsWriteAux() ? memaux : NULL;
} }
} }

5
source/Windows/AppleWin.cpp
View File

@ -565,13 +565,14 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
} }
} }
while (g_bRestart); while (g_bRestart);
Shutdown();
} }
catch(const std::exception & exception) catch (const std::exception& exception)
{ {
ExceptionHandler(exception.what()); ExceptionHandler(exception.what());
} }
Shutdown();
return 0; return 0;
} }