tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applypatch: Release FD when explicitly calling close.

Browse source 
We use android::base::unique_fd() to avoid leaking FD. We also want to
call close (or ota_close) to explicitly check the close result. When
combining the two together, we need to release the unique_fd to avoid
closing the same FD twice.

Bug: 33034669
Test: Trigger applypatch with install-recovery.sh.
Change-Id: I1a4f5d5fba7a23ef98d8bd7b7b07e87ae6f705c5
This commit is contained in:
Tao Bao 2016-11-21 09:42:33 -08:00
parent 1d77c93bcc
commit 48cf770471
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applypatch/applypatch.cpp
View file

@ -210,7 +210,7 @@ int SaveFileContents(const char* filename, const FileContents* file) {
printf("fsync of \"%s\" failed: %s\n", filename, strerror(errno));
return -1;
}
if (ota_close(fd) != 0) {
if (ota_close(fd.release()) != 0) {
printf("close of \"%s\" failed: %s\n", filename, strerror(errno));
return -1;
}
@ -268,7 +268,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t
printf("failed to sync to %s: %s\n", partition, strerror(errno));
return -1;
}
if (ota_close(fd) != 0) {
if (ota_close(fd.release()) != 0) {
printf("failed to close %s: %s\n", partition, strerror(errno));
return -1;
}
@ -287,7 +287,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t
} else {
printf(" caches dropped\n");
}
ota_close(dc);
ota_close(dc.release());
sleep(1);
// Verify.
@ -339,7 +339,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t
return -1;
}
if (ota_close(fd) == -1) {
if (ota_close(fd.release()) == -1) {
printf("error closing %s: %s\n", partition, strerror(errno));
return -1;
}
@ -782,7 +782,7 @@ static int GenerateTarget(FileContents* source_file,
printf("failed to fsync file \"%s\": %s\n", tmp_target_filename.c_str(), strerror(errno));
result = 1;
}
if (ota_close(output_fd) != 0) {
if (ota_close(output_fd.release()) != 0) {
printf("failed to close file \"%s\": %s\n", tmp_target_filename.c_str(), strerror(errno));
result = 1;
}