Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-18 22:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDImageEcm: Better error handling for corrupted dumps

Browse source
This commit is contained in:
Connor McLaughlin 2021-06-10 18:28:33 +10:00
parent 1e2bdc11e7
commit d53daf2f26
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/common/cd_image_ecm.cpp
View file

@ -234,6 +234,17 @@ bool CDImageEcm::Open(const char* filename, Common::Error* error)
return false; return false;
} }
s64 file_size;
if (FileSystem::FSeek64(m_fp, 0, SEEK_END) != 0 || (file_size = FileSystem::FTell64(m_fp)) <= 0 ||
FileSystem::FSeek64(m_fp, 0, SEEK_SET) != 0)
{
Log_ErrorPrintf("Get file size failed: errno %d", errno);
if (error)
error->SetErrno(errno);
return false;
}
char header[4]; char header[4];
if (std::fread(header, sizeof(header), 1, m_fp) != 1 || header[0] != 'E' || header[1] != 'C' || header[2] != 'M' || if (std::fread(header, sizeof(header), 1, m_fp) != 1 || header[0] != 'E' || header[1] != 'C' || header[2] != 'M' ||
header[3] != 0) header[3] != 0)
@ -306,6 +317,13 @@ bool CDImageEcm::Open(const char* filename, Common::Error* error)
disc_offset += size; disc_offset += size;
file_offset += size; file_offset += size;
count -= size; count -= size;
if (static_cast<s64>(file_offset) > file_size)
{
Log_ErrorPrintf("Out of file bounds after %zu chunks", m_data_map.size());
if (error)
error->SetFormattedMessage("Out of file bounds after %zu chunks", m_data_map.size());
}
} }
} }
else else
@ -317,6 +335,13 @@ bool CDImageEcm::Open(const char* filename, Common::Error* error)
m_data_map.emplace(disc_offset, SectorEntry{file_offset, chunk_size, type}); m_data_map.emplace(disc_offset, SectorEntry{file_offset, chunk_size, type});
disc_offset += chunk_size; disc_offset += chunk_size;
file_offset += size; file_offset += size;
if (static_cast<s64>(file_offset) > file_size)
{
Log_ErrorPrintf("Out of file bounds after %zu chunks", m_data_map.size());
if (error)
error->SetFormattedMessage("Out of file bounds after %zu chunks", m_data_map.size());
}
} }
} }