Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Close the FD after opening the file" into sc-dev

Browse Source
This commit is contained in:
Jeffrey Huang
2021-03-31 19:57:57 +00:00
committed by Android (Google) Code Review
parent 5c4553b29f ab40ab67ce
commit 090ceb3af9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/incidentd/src/WorkDirectory.cpp
View File

@@ -400,6 +400,7 @@ status_t ReportFile::startFilteringData(int writeFd, const IncidentReportArgs& a
if (dataFd < 0) {
ALOGW("Error opening incident report '%s' %s", getDataFileName().c_str(), strerror(-errno));
close(writeFd);
close(dataFd);
return -errno;
}
@@ -409,6 +410,7 @@ status_t ReportFile::startFilteringData(int writeFd, const IncidentReportArgs& a
ALOGW("Error running fstat incident report '%s' %s", getDataFileName().c_str(),
strerror(-errno));
close(writeFd);
close(dataFd);
return -errno;
}
if (st.st_size != mEnvelope.data_file_size()) {
@@ -418,6 +420,7 @@ status_t ReportFile::startFilteringData(int writeFd, const IncidentReportArgs& a
ALOGW("Removing incident report");
mWorkDirectory->remove(this);
close(writeFd);
close(dataFd);
return BAD_VALUE;
}
@@ -427,11 +430,13 @@ status_t ReportFile::startFilteringData(int writeFd, const IncidentReportArgs& a
if (!zipPipe.init()) {
ALOGE("[ReportFile] Failed to setup pipe for gzip");
close(writeFd);
close(dataFd);
return -errno;
}
int status = 0;
zipPid = fork_execute_cmd((char* const*)GZIP, zipPipe.readFd().release(), writeFd, &status);
close(writeFd);
close(dataFd);
if (zipPid < 0 || status != 0) {
ALOGE("[ReportFile] Failed to fork and exec gzip");
return status;
@@ -459,6 +464,7 @@ status_t ReportFile::startFilteringData(int writeFd, const IncidentReportArgs& a
}
close(writeFd);
close(dataFd);
if (zipPid > 0) {
status_t err = wait_child(zipPid, /* timeout_ms= */ 10 * 1000);
if (err != 0) {