tastytea/epubgrep
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 9 Wiki Activity

Fix some more memory leaks.

Browse Source
This commit is contained in:
tastytea 2021-05-27 20:11:59 +02:00
parent b24ea9b71e
commit 38bf9be948
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zip.cpp
View File

@ -46,6 +46,7 @@ std::vector<std::string> list(const fs::path &filepath)
toc.emplace_back(archive_entry_pathname_utf8(entry)); toc.emplace_back(archive_entry_pathname_utf8(entry));
archive_read_data_skip(zipfile); archive_read_data_skip(zipfile);
} }
close_file(zipfile, filepath); close_file(zipfile, filepath);
return toc; return toc;
@ -69,12 +70,15 @@ std::string read_file(const fs::path &filepath, std::string_view entry_path)
if (result_length != length) if (result_length != length)
{ {
close_file(zipfile, filepath);
throw exception{ throw exception{
format(translate("Could not read {0:s} in {1:s}.").str(), format(translate("Could not read {0:s} in {1:s}.").str(),
entry_path, filepath.string())}; entry_path, filepath.string())};
} }
close_file(zipfile, filepath); close_file(zipfile, filepath);
return filecontents; return filecontents;
} }
archive_read_data_skip(zipfile); archive_read_data_skip(zipfile);
@ -95,6 +99,8 @@ struct archive *open_file(const fs::path &filepath)
auto result{archive_read_open_filename(zipfile, filepath.c_str(), 10240)}; auto result{archive_read_open_filename(zipfile, filepath.c_str(), 10240)};
if (result != ARCHIVE_OK) if (result != ARCHIVE_OK)
{ {
close_file(zipfile, filepath);
throw exception{format(translate("Could not open {0:s}.").str(), throw exception{format(translate("Could not open {0:s}.").str(),
filepath.string())}; filepath.string())};
} }