commit 272c33e5a95894f802a03fe93713273804158bf6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 17 11:34:40 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 17 11:34:40 2018 +0000
tree d4e8de7a0f170604288cd93e66a3c6dbdb0befe0
parent 34554c9a6aadd66845a25d1b23a64759f6692e32
parent 4572ade694e35f19c3b2d2c68a573eb8e40a7ccb

Merge "Fix memory leak in hiddenapi_test"

tools/hiddenapi/hiddenapi_test.cc

diff --git a/tools/hiddenapi/hiddenapi_test.cc b/tools/hiddenapi/hiddenapi_test.cc
index 1f37f40..6348405 100644
--- a/tools/hiddenapi/hiddenapi_test.cc
+++ b/tools/hiddenapi/hiddenapi_test.cc
@@ -46,12 +46,13 @@
                                               const std::vector<std::string>& extra_args,
                                               ScratchFile* out_dex) {
     std::string error;
-    ZipArchive* jar = ZipArchive::Open(GetTestDexFileName("HiddenApi").c_str(), &error);
+    std::unique_ptr<ZipArchive> jar(
+        ZipArchive::Open(GetTestDexFileName("HiddenApi").c_str(), &error));
     if (jar == nullptr) {
       LOG(FATAL) << "Could not open test file " << GetTestDexFileName("HiddenApi") << ": " << error;
       UNREACHABLE();
     }
-    ZipEntry* jar_classes_dex = jar->Find("classes.dex", &error);
+    std::unique_ptr<ZipEntry> jar_classes_dex(jar->Find("classes.dex", &error));
     if (jar_classes_dex == nullptr) {
       LOG(FATAL) << "Could not find classes.dex in test file " << GetTestDexFileName("HiddenApi")
                  << ": " << error;