commit ee9956ad4fa9694f2a693a53e4c759ef9de2d901
author Greg Kaiser <gkaiser@google.com> Fri Aug 12 17:48:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 12 17:48:59 2016 +0000
tree 01d6721213873d413c26039ed4a76fc45e015c79
parent 77eaf3f1e07508cca2bdd38049d59b0c22bf12d4
parent d2bf5cba26be148ca334f2c5d1c228030f392ea4

Merge "fastboot: Don't leak file in error case" am: 3a197b3799
am: 0c8a67bbfd

Change-Id: I3939b2c4a64f2d9f6513850abf00e93a2b904648

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index f622ea7..d61c3e5 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -579,6 +579,7 @@
     ZipEntry zip_entry;
     if (FindEntry(zip, zip_entry_name, &zip_entry) != 0) {
         fprintf(stderr, "archive does not contain '%s'\n", entry_name);
+        fclose(fp);
         return -1;
     }
 
@@ -586,10 +587,12 @@
     int error = ExtractEntryToFile(zip, &zip_entry, fd);
     if (error != 0) {
         fprintf(stderr, "failed to extract '%s': %s\n", entry_name, ErrorCodeString(error));
+        fclose(fp);
         return -1;
     }
 
     lseek(fd, 0, SEEK_SET);
+    // TODO: We're leaking 'fp' here.
     return fd;
 }