openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Disallow operator!() on unique_fd" am: 0a887aa14c 

am: c730327691

Change-Id: I6c3a19d5b9bd559d84e90aeaa7264a6c5c472e9d
This commit is contained in:
Bernie Innocenti 2019-03-28 21:15:11 -07:00 committed by android-build-merger
parent 707d0b6da5 c730327691
commit ba394579cb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base/include/android-base/unique_fd.h
View File

@ -105,6 +105,9 @@ class unique_fd_impl final {
int get() const { return fd_; }
operator int() const { return get(); } // NOLINT
// Catch bogus error checks (i.e.: "!fd" instead of "fd != -1").
bool operator!() const = delete;
int release() __attribute__((warn_unused_result)) {
tag(fd_, this, nullptr);
int ret = fd_;

2
init/service.cpp
View File

@ -177,7 +177,7 @@ Result<Success> Service::SetUpPidNamespace() const {
Result<Success> Service::EnterNamespaces() const {
for (const auto& [nstype, path] : namespaces_to_enter_) {
auto fd = unique_fd{open(path.c_str(), O_RDONLY | O_CLOEXEC)};
if (!fd) {
if (fd == -1) {
return ErrnoError() << "Could not open namespace at " << path;
}
if (setns(fd, nstype) == -1) {