ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDImageM3u: Fix crash when error pointer is null

This commit is contained in:
Connor McLaughlin 2021-05-12 16:35:18 +10:00
parent 6e189f4fd0
commit 69fb8de644
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/cd_image_m3u.cpp
View File

@ -53,15 +53,16 @@ bool CDImageM3u::Open(const char* path, Common::Error* error)
if (!fp)
return false;
std::optional<std::string> cue_file(FileSystem::ReadFileToString(fp));
std::optional<std::string> m3u_file(FileSystem::ReadFileToString(fp));
std::fclose(fp);
if (!cue_file.has_value() || cue_file->empty())
if (!m3u_file.has_value() || m3u_file->empty())
{
error->SetMessage("Failed to read cue sheet");
if (error)
error->SetMessage("Failed to read M3u file");
return false;
}
std::istringstream ifs(cue_file.value());
std::istringstream ifs(m3u_file.value());
m_filename = path;
std::vector<std::string> entries;