commit 8f01dd593e4ec54f1763dab83ff8294ab0241689
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 12 17:34:49 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 12 17:34:49 2016 +0000
tree c282dcdf6cf94825df933a985f80d7e1d904b897
parent 408ef1bc259bc4ce005b676707469ecde1a23ed0
parent 49d7e15d66909f445e429184f986ecfb63b6f0a5

Merge "fastboot: Don't leak file in error case"

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index dde21d5..c097d04 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -519,6 +519,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;
     }
 
@@ -526,10 +527,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;
 }