Merge "init/service.cpp: fix FD leak for services with consoles" am: 4173d9b57c
am: 869ce5d40a
Change-Id: I10da3853a13192ed91a405894a96086262be2aa2
This commit is contained in:
commit
9bebb6f3a3
1 changed files with 2 additions and 2 deletions
|
|
@ -567,9 +567,9 @@ bool Service::Start() {
|
|||
console_ = default_console;
|
||||
}
|
||||
|
||||
bool have_console = (open(console_.c_str(), O_RDWR | O_CLOEXEC) != -1);
|
||||
bool have_console = (access(console_.c_str(), R_OK | W_OK) != -1);
|
||||
if (!have_console) {
|
||||
PLOG(ERROR) << "service '" << name_ << "' couldn't open console '" << console_ << "'";
|
||||
PLOG(ERROR) << "service '" << name_ << "' cannot gain read/write access to console '" << console_ << "'";
|
||||
flags_ |= SVC_DISABLED;
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue