commit 2f7ccd5856fe956139c01edf63cf347b247af09e
author Greg Kaiser <gkaiser@google.com> Fri Aug 12 17:52:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 12 17:52:29 2016 +0000
tree 6cd79b39779eb341d3a97082b1fc565ded6a6d06
parent f9fb584b664ab60c1d2ce7162dac262f8fd14ff3
parent 3ab37d88445442c1231a6431be90435c1b1fcc61

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

Change-Id: I1bc5d9183e116819c4e92ed6f29e63936a334740

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 314ed42..ce8df88 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -599,6 +599,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;
     }
 
@@ -606,10 +607,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;
 }