alterware/aw-installer
1
0
Fork 0
mirror of https://github.com/alterware/aw-installer.git synced 2025-06-27 06:41:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: address a potential memory leak

Browse Source
This commit is contained in:
6arelyFuture
2024-04-01 19:05:29 +02:00
parent f3adaf4847
commit b08d201b87
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils/compression.cpp
View File

@ -46,10 +46,10 @@ namespace utils::compression
z_stream& get()
{
return stream_; //
return stream_;
}
bool is_valid() const
[[nodiscard]] bool is_valid() const
{
return valid_;
}
@ -177,7 +177,7 @@ namespace utils::compression
}
// I apologize for writing such a huge function
// I'm Using make_preferred() so / are converted to \\ on Windows but not on POSIX
// I'm using make_preferred() so / are converted to \\ on Windows but not on POSIX
void archive::decompress(const std::string& filename, const std::filesystem::path& out_dir)
{
unzFile file = unzOpen(filename.c_str());
@ -229,7 +229,7 @@ namespace utils::compression
// Entry is a file. Extract it.
if (unzOpenCurrentFile(file) != UNZ_OK)
{
// Could not read file from the ZIP
unzClose(file);
throw std::runtime_error(string::va("Failed to read file \"%s\" from \"%s\"", out_file.c_str(), filename.c_str()));
}
@ -243,6 +243,8 @@ namespace utils::compression
std::ofstream out(path.make_preferred().string(), std::ios::binary | std::ios::trunc);
if (!out.is_open())
{
unzCloseCurrentFile(file);
unzClose(file);
throw std::runtime_error("Failed to open stream");
}
@ -252,6 +254,8 @@ namespace utils::compression
read_bytes = unzReadCurrentFile(file, read_buffer, READ_BUFFER_SIZE);
if (read_bytes < 0)
{
unzCloseCurrentFile(file);
unzClose(file);
throw std::runtime_error(string::va("Error while reading \"%s\" from the archive", out_file.c_str()));
}
@ -273,6 +277,7 @@ namespace utils::compression
// Go the the next entry listed in the ZIP file.
if ((i + 1) < global_info.number_entry)
{
// According to the AI overlords I do not need to close the file with unzCloseCurrentFile here
if (unzGoToNextFile(file) != UNZ_OK)
{
break;

4
src/utils/io.cpp
View File

@ -8,12 +8,12 @@ namespace utils::io
{
bool remove_file(const std::string& file)
{
return remove(file.c_str()) == 0;
return std::remove(file.c_str()) == 0;
}
bool move_file(const std::string& src, const std::string& target)
{
return rename(src.c_str(), target.c_str()) == 0;
return std::rename(src.c_str(), target.c_str()) == 0;
}
bool file_exists(const std::string& file)