Commit 0955d208 authored Sep 26, 2019 by Mårten Kongstad Committed by Todd Kennedy Sep 26, 2019

idmap2: ZipFile::Open: fix potential memory leak

Even if OpenArchive in libziparchive returns a non-zero value
(indicating failure), it will have allocated memory that needs to be
freed via CloseArchive. Add the missing call.

Test: valgrind --leak-check=full --show-leak-kinds=all --error-exitcode=1 $ANDROID_HOST_OUT/nativetest64/idmap2_tests/idmap2_tests
Change-Id: I92d47459c27e62ba4544327d7b7f3c4106e6ad34

parent e2415eee

cmds/idmap2/libidmap2/ZipFile.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ std::unique_ptr<const ZipFile> ZipFile::Open(const std::string& path) {
		::ZipArchiveHandle handle;
		int32_t status = ::OpenArchive(path.c_str(), &handle);
		if (status != 0) {
		::CloseArchive(handle);
		return nullptr;
		}
		return std::unique_ptr<ZipFile>(new ZipFile(handle));