ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDVD: Fix possible uncaught exception in CheckDiskTypeFS

This commit is contained in:
Connor McLaughlin 2021-10-01 15:48:04 +10:00 committed by refractionpcsx2
parent e0caacfa6f
commit 97b94acd86
1 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
pcsx2/CDVD/CDVDaccess.cpp
View File

@ -77,45 +77,51 @@ static void CheckNullCDVD()
static int CheckDiskTypeFS(int baseType) static int CheckDiskTypeFS(int baseType)
{ {
IsoFSCDVD isofs; IsoFSCDVD isofs;
IsoDirectory rootdir(isofs);
try try
{ {
IsoFile file(rootdir, L"SYSTEM.CNF;1"); IsoDirectory rootdir(isofs);
int size = file.getLength(); try
std::unique_ptr<char[]> buffer(new char[file.getLength() + 1]);
file.read(buffer.get(), size);
buffer[size] = '\0';
char* pos = strstr(buffer.get(), "BOOT2");
if (pos == NULL)
{ {
pos = strstr(buffer.get(), "BOOT"); IsoFile file(rootdir, L"SYSTEM.CNF;1");
const int size = file.getLength();
const std::unique_ptr<char[]> buffer = std::make_unique<char[]>(size + 1);
file.read(buffer.get(), size);
buffer[size] = '\0';
char* pos = strstr(buffer.get(), "BOOT2");
if (pos == NULL) if (pos == NULL)
return CDVD_TYPE_ILLEGAL; {
return CDVD_TYPE_PSCD; pos = strstr(buffer.get(), "BOOT");
if (pos == NULL)
return CDVD_TYPE_ILLEGAL;
return CDVD_TYPE_PSCD;
}
return (baseType == CDVD_TYPE_DETCTCD) ? CDVD_TYPE_PS2CD : CDVD_TYPE_PS2DVD;
}
catch (Exception::FileNotFound&)
{
} }
return (baseType == CDVD_TYPE_DETCTCD) ? CDVD_TYPE_PS2CD : CDVD_TYPE_PS2DVD; try
} {
catch (Exception::FileNotFound&) IsoFile file(rootdir, L"PSX.EXE;1");
{ return CDVD_TYPE_PSCD;
} }
catch (Exception::FileNotFound&)
{
}
try try
{ {
IsoFile file(rootdir, L"PSX.EXE;1"); IsoFile file(rootdir, L"VIDEO_TS/VIDEO_TS.IFO;1");
return CDVD_TYPE_PSCD; return CDVD_TYPE_DVDV;
} }
catch (Exception::FileNotFound&) catch (Exception::FileNotFound&)
{ {
} }
try
{
IsoFile file(rootdir, L"VIDEO_TS/VIDEO_TS.IFO;1");
return CDVD_TYPE_DVDV;
} }
catch (Exception::FileNotFound&) catch (Exception::FileNotFound&)
{ {