commit 6bb8a685b581b73124a6b0cef56d76bcfbadd99d
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 26 03:07:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 26 03:07:10 2022 +0000
tree 1a47d1bd6d5097c6435fd270bc3aafcff2c224b1
parent 772366e424f81f56aaf437ce40e51cbface5c32c
parent 0af756cd6f67fe1b615a3a65451069a730bdb0d2

Merge "Fix memory leak in OTA verifier code" am: 65162cd9b0 am: efc4279944 am: 6e0b7fa5ec am: 1ec805514b am: 0af756cd6f

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2106828

Change-Id: I5a0940074e802dc49b7316c6eda21cc61bc5e72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

otautil/verifier.cpp

diff --git a/otautil/verifier.cpp b/otautil/verifier.cpp
index 8a65566..83ad708 100644
--- a/otautil/verifier.cpp
+++ b/otautil/verifier.cpp
@@ -309,13 +309,15 @@
 }
 
 static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchiveHandle& handle) {
-  void* cookie;
+  void* cookie{};
+
   int32_t iter_status = StartIteration(handle, &cookie, "", "x509.pem");
   if (iter_status != 0) {
     LOG(ERROR) << "Failed to iterate over entries in the certificate zipfile: "
                << ErrorCodeString(iter_status);
     return {};
   }
+  std::unique_ptr<void, decltype(&EndIteration)> cookie_guard(cookie, &EndIteration);
 
   std::vector<Certificate> result;