empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug in Disk_t: ZeroMemory() does not work for non POD.

Browse source 
Disk_t is NOT a POD as it contains a std::string.
Simply zeroing the memory is not a replacement for a constructor or for a .clear() method.
This would cause access violation when the string strFilenameInZip is used (e.g. line 365).

It is possible that in VS a std::string full of zeros is valid.
This can be triggered inserting the same floppy in both drives.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2017-06-05 20:45:55 +01:00
parent 05a55c0735
commit 0ee3225026
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
source/Disk.cpp
View file

@ -89,6 +89,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
DWORD writelight; DWORD writelight;
int nibbles; // Init'd by ReadTrack() -> ImageReadTrack() int nibbles; // Init'd by ReadTrack() -> ImageReadTrack()
Disk_t()
{
clear();
}
const Disk_t& operator= (const Disk_t& other) const Disk_t& operator= (const Disk_t& other)
{ {
memcpy(imagename, other.imagename, sizeof(imagename)); memcpy(imagename, other.imagename, sizeof(imagename));
@ -107,11 +112,29 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
nibbles = other.nibbles; nibbles = other.nibbles;
return *this; return *this;
} }
void clear()
{
ZeroMemory(imagename, sizeof(imagename));
ZeroMemory(fullname, sizeof(imagename));
strFilenameInZip.clear();
imagehandle = NULL;
bWriteProtected = false;
track = 0;
trackimage = NULL;
phase = 0;
byte = 0;
trackimagedata = FALSE;
trackimagedirty = 0;
spinning = 0;
writelight = 0;
nibbles = 0;
}
}; };
static WORD currdrive = 0; static WORD currdrive = 0;
static BOOL diskaccessed = 0; static BOOL diskaccessed = 0;
static Disk_t g_aFloppyDisk[NUM_DRIVES]; static std::vector<Disk_t> g_aFloppyDisk(NUM_DRIVES);
static BYTE floppylatch = 0; static BYTE floppylatch = 0;
static BOOL floppymotoron = 0; static BOOL floppymotoron = 0;
static BOOL floppyloadmode = 0; // for efficiency this is not used; it's extremely unlikely to affect emulation (nickw) static BOOL floppyloadmode = 0; // for efficiency this is not used; it's extremely unlikely to affect emulation (nickw)
@ -551,7 +574,7 @@ void DiskInitialize(void)
{ {
int loop = NUM_DRIVES; int loop = NUM_DRIVES;
while (loop--) while (loop--)
ZeroMemory(&g_aFloppyDisk[loop], sizeof(Disk_t)); g_aFloppyDisk[loop].clear();
TCHAR imagefilename[MAX_PATH]; TCHAR imagefilename[MAX_PATH];
_tcscpy(imagefilename,g_sProgramDir); _tcscpy(imagefilename,g_sProgramDir);
@ -570,7 +593,7 @@ ImageError_e DiskInsert(const int iDrive, LPCTSTR pszImageFilename, const bool b
{ {
int track = fptr->track; int track = fptr->track;
int phase = fptr->phase; int phase = fptr->phase;
ZeroMemory(fptr, sizeof(Disk_t)); fptr->clear();
fptr->track = track; fptr->track = track;
fptr->phase = phase; fptr->phase = phase;
} }
@ -1149,7 +1172,7 @@ int DiskSetSnapshot_v1(const SS_CARD_DISK2* const pSS)
for(UINT i=0; i<NUM_DRIVES; i++) for(UINT i=0; i<NUM_DRIVES; i++)
{ {
DiskEject(i); // Remove any disk & update Registry to reflect empty drive DiskEject(i); // Remove any disk & update Registry to reflect empty drive
ZeroMemory(&g_aFloppyDisk[i], sizeof(Disk_t)); g_aFloppyDisk[i].clear();
} }
for(UINT i=0; i<NUM_DRIVES; i++) for(UINT i=0; i<NUM_DRIVES; i++)
@ -1384,7 +1407,7 @@ bool DiskLoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT vers
for(UINT i=0; i<NUM_DRIVES; i++) for(UINT i=0; i<NUM_DRIVES; i++)
{ {
DiskEject(i); // Remove any disk & update Registry to reflect empty drive DiskEject(i); // Remove any disk & update Registry to reflect empty drive
ZeroMemory(&g_aFloppyDisk[i], sizeof(Disk_t)); g_aFloppyDisk[i].clear();
} }
DiskLoadSnapshotDriveUnit(yamlLoadHelper, DRIVE_1); DiskLoadSnapshotDriveUnit(yamlLoadHelper, DRIVE_1);