SunRed/SpaceCadetPinball
1
0
Fork 0
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git synced 2025-09-07 16:50:15 +02:00
Code Issues Releases Activity

fix harmless warnings and properly try/catch allocations via new

Browse source 
otherwise the error handling will never be triggered
This commit is contained in:
toxie 2021-10-17 19:28:09 +02:00
parent 06b760e8dd
commit 3b11d6019b
24 changed files with 219 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

27
SpaceCadetPinball/partman.cpp
View file

@ -27,8 +27,12 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
return nullptr;
}
auto datFile = new DatFile();
if (!datFile)
DatFile* datFile;
try
{
datFile = new DatFile();
}
catch (...)
{
fclose(fileHandle);
return nullptr;
@ -39,8 +43,12 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
if (header.Unknown)
{
auto unknownBuf = new char[header.Unknown];
if (!unknownBuf)
char* unknownBuf;
try
{
unknownBuf = new char[header.Unknown];
}
catch (...)
{
fclose(fileHandle);
delete datFile;
@ -107,13 +115,18 @@ DatFile* partman::load_records(LPCSTR lpFileName, bool fullTiltMode)
}
else
{
auto entryBuffer = new char[fieldSize];
entryData->Buffer = entryBuffer;
if (!entryBuffer)
char* entryBuffer;
try
{
entryBuffer = new char[fieldSize];
}
catch (...)
{
entryData->Buffer = nullptr;
abort = true;
break;
}
entryData->Buffer = entryBuffer;
fread(entryBuffer, 1, fieldSize, fileHandle);
}