From 4184d6eef5ec3e1fbb0c5080a976406de1f23203 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 21 Sep 2015 20:43:08 +0200 Subject: [PATCH] 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 --- pcsx2/CDVD/CsoFileReader.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pcsx2/CDVD/CsoFileReader.cpp b/pcsx2/CDVD/CsoFileReader.cpp index 4cc85af403..9105e34bc3 100644 --- a/pcsx2/CDVD/CsoFileReader.cpp +++ b/pcsx2/CDVD/CsoFileReader.cpp @@ -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; }