history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-17 04:25:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

GameList: Fix uninitialized fields of PSF/EXE

Browse Source
This commit is contained in:
Connor McLaughlin
2021-04-17 20:20:09 +10:00
parent 8ad0f78ef7
commit 2985c395df
3 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/psf_loader.cpp
View File

@ -59,27 +59,16 @@ float File::GetTagFloat(const char* tag_name, float default_value) const
bool File::Load(const char* path)
{
auto fp = FileSystem::OpenManagedCFile(path, "rb");
if (!fp)
std::optional<std::vector<u8>> file_data(FileSystem::ReadBinaryFile(path));
if (!file_data.has_value() || file_data->empty())
{
Log_ErrorPrintf("Failed to open PSF file '%s'", path);
Log_ErrorPrintf("Failed to open/read PSF file '%s'", path);
return false;
}
// we could mmap this instead
std::fseek(fp.get(), 0, SEEK_END);
const u32 file_size = static_cast<u32>(std::ftell(fp.get()));
std::fseek(fp.get(), 0, SEEK_SET);
std::vector<u8> file_data(file_size);
if (std::fread(file_data.data(), 1, file_size, fp.get()) != file_size)
{
Log_ErrorPrintf("Failed to read data from PSF '%s'", path);
return false;
}
const u8* file_pointer = file_data.data();
const u8* file_pointer_end = file_data.data() + file_data.size();
const u8* file_pointer = file_data->data();
const u8* file_pointer_end = file_data->data() + file_data->size();
const u32 file_size = static_cast<u32>(file_data->size());
PSFHeader header;
std::memcpy(&header, file_pointer, sizeof(header));