Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc347b9d authored by Bernie Innocenti's avatar Bernie Innocenti Committed by android-build-merger
Browse files

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

am: ba394579

Change-Id: Ie9bfc735da5d1f74da3a409e910e012aaf0c4431
parents 8f1e95e0 ba394579

base/include/android-base/unique_fd.h

+3 −0
Original line number Diff line number Diff line
@@ -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_;

init/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {