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

pcsx2:cso: NULL pointer check 

Coverity:

CID 146846 (#1 of 1): Dereference after null check (FORWARD_NULL)
5. var_deref_model: Passing null pointer fp to fclose, which dereferences it
This commit is contained in:
Gregory Hainaut 2015-09-21 20:43:08 +02:00
parent b9e00ab611
commit 4184d6eef5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/CDVD/CsoFileReader.cpp
View File

@ -43,10 +43,12 @@ bool CsoFileReader::CanHandle(const wxString& fileName) {
if (wxFileName::FileExists(fileName) && fileName.Lower().EndsWith(L".cso")) {
FILE* fp = PX_fopen_rb(fileName);
CsoHeader hdr;
if (fp && fread(&hdr, 1, sizeof(hdr), fp) == sizeof(hdr)) {
supported = ValidateHeader(hdr);
if (fp) {
if (fread(&hdr, 1, sizeof(hdr), fp) == sizeof(hdr)) {
supported = ValidateHeader(hdr);
}
fclose(fp);
}
fclose(fp);
}
return supported;
}