commit 407a2195391685627e6be947491041ae3c8cbe61
author Greg Kaiser <gkaiser@google.com> Thu Aug 11 11:34:16 2016 -0700
committer Greg Kaiser <gkaiser@google.com> Fri Aug 12 06:09:42 2016 -0700
tree 5f9e53f34d38e246664874649a1d4c7d57ab4178
parent 7b46106345b980d405f3467310870fcd370a17bf

fastboot: Don't leak file in error case

This is probably not very significant in this standalone tool,
but makes it easier for us to find leaks in our other system
code via static analysis.

Change-Id: I4e14cadc1e53bac0848e0e0c7f531f920e43cb0a

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;
 }