Merge "fastboot: Don't leak file in error case"
am: 3a197b3799
Change-Id: Ieaab2ed5c1619f75fa4c334d61afaf858ad7d46c
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;
}