Merge pull request #8286 from Hinsbart/memleaks

Core: fix possible memory leaks.
This commit is contained in:
Rémi Verschelde 2017-04-06 14:34:21 +02:00 committed by GitHub
commit 1a33d5e06f
2 changed files with 2 additions and 2 deletions

View file

@ -149,8 +149,7 @@ unzFile ZipArchive::get_file_handle(String p_file) const {
unzFile pkg = unzOpen2(packages[file.package].filename.utf8().get_data(), &io);
ERR_FAIL_COND_V(!pkg, NULL);
int unz_err = unzGoToFilePos(pkg, &file.file_pos);
ERR_FAIL_COND_V(unz_err != UNZ_OK, NULL);
if (unzOpenCurrentFile(pkg) != UNZ_OK) {
if (unz_err != UNZ_OK || unzOpenCurrentFile(pkg) != UNZ_OK) {
unzClose(pkg);
ERR_FAIL_V(NULL);

View file

@ -172,6 +172,7 @@ Error PCKPacker::flush(bool p_verbose) {
printf("\n");
file->close();
memdelete(buf);
return OK;
};