Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional null checks & file failure handling #4063

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Additional null checks & file failure handling #4063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c74a91
Handle PHYSFS_openRead failures
past-due Sep 11, 2024
a9db82b
updatemanager: Close file on failure
past-due Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/updatemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,16 +726,23 @@ static bool cacheInfoIsUsable(CachePaths& paths)
try {
// Open the file + read the data
PHYSFS_file *fileHandle = PHYSFS_openRead(paths.cache_info_path);
if (fileHandle == nullptr)
{
// Unable to open file
throw std::runtime_error("Failed opening file");
}
PHYSFS_sint64 filesize = PHYSFS_fileLength(fileHandle);
if (filesize <= 0)
{
// Invalid file size
PHYSFS_close(fileHandle);
throw std::runtime_error("Invalid filesize");
}
std::vector<char> fileData(static_cast<size_t>(filesize + 1), '\0');
if (WZ_PHYSFS_readBytes(fileHandle, fileData.data(), static_cast<PHYSFS_uint32>(filesize)) != filesize)
{
// Read failed
PHYSFS_close(fileHandle);
throw std::runtime_error("Read failed");
}
PHYSFS_close(fileHandle);
Expand Down Expand Up @@ -777,16 +784,23 @@ static void initProcessData(const std::vector<std::string> &updateDataUrls, Proc
try {
// Open the file + read the data
PHYSFS_file *fileHandle = PHYSFS_openRead(outputPaths.cache_data_path);
if (fileHandle == nullptr)
{
// Unable to open file
throw std::runtime_error("Failed opening file");
}
PHYSFS_sint64 filesize = PHYSFS_fileLength(fileHandle);
if (filesize < 0 || filesize > WZ_UPDATES_JSON_MAX_SIZE)
{
// Invalid file size
PHYSFS_close(fileHandle);
throw std::runtime_error("Invalid filesize");
}
std::vector<char> fileData(static_cast<size_t>(filesize + 1), '\0');
if (WZ_PHYSFS_readBytes(fileHandle, fileData.data(), static_cast<PHYSFS_uint32>(filesize)) != filesize)
{
// Read failed
PHYSFS_close(fileHandle);
throw std::runtime_error("Read failed");
}
PHYSFS_close(fileHandle);
Expand Down
Loading