commit dc2627111ece3ab17331103ea18cfda98cd74411
author Bernie Innocenti <codewiz@google.com> Thu Mar 28 21:31:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 28 21:31:39 2019 -0700
tree 6521d5f406c157b4fc29296c9332a7a0b30ff8c4
parent 24181212228c3f8729eba540e3a0017a16e76807
parent badc30933fbc5812d84c143d811c6db3f1352e29

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

Change-Id: Ie9bfc735da5d1f74da3a409e910e012aaf0c4431

base/include/android-base/unique_fd.h

diff --git a/base/include/android-base/unique_fd.h b/base/include/android-base/unique_fd.h
index 83213e9..3fa3bea 100644
--- a/base/include/android-base/unique_fd.h
+++ b/base/include/android-base/unique_fd.h
@@ -105,6 +105,9 @@
   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_;

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 6d08cb1..f5c13b9 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -177,7 +177,7 @@
 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) {