Merge "fastboot: Don't leak file in error case" am: 3a197b3799
am: 0c8a67bbfd
Change-Id: I3939b2c4a64f2d9f6513850abf00e93a2b904648
This commit is contained in:
commit
3ab37d8844
|
@ -579,6 +579,7 @@ static int unzip_to_file(ZipArchiveHandle zip, char* entry_name) {
|
|||
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 @@ static int unzip_to_file(ZipArchiveHandle zip, char* entry_name) {
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue