Fix double-close in EventConverterEvdevImpl

ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h"
 
 #include <errno.h>
 #include <libevdev/libevdev.h>
 #include <linux/input.h>
 #include <utility>
@@ skipping 10 matching lines @@
 std::string FormatLog(const char* fmt, va_list args) {
   std::string msg = base::StringPrintV(fmt, args);
   if (!msg.empty() && msg.back() == '\n')
     msg.pop_back();
   return msg;
 }
 
 }  // namespace
 
 EventReaderLibevdevCros::EventReaderLibevdevCros(
-    int fd,
+    ScopedInputDevice fd,
     const base::FilePath& path,
     int id,
     const EventDeviceInfo& devinfo,
     std::unique_ptr<Delegate> delegate)
-    : EventConverterEvdev(fd,
+    : EventConverterEvdev(fd.get(),
                           path,
                           id,
                           devinfo.device_type(),
                           devinfo.name(),
                           devinfo.vendor_id(),
                           devinfo.product_id()),
       has_keyboard_(devinfo.HasKeyboard()),
       has_mouse_(devinfo.HasMouse()),
       has_touchpad_(devinfo.HasTouchpad()),
       has_caps_lock_led_(devinfo.HasLedEvent(LED_CAPSL)),
       delegate_(std::move(delegate)) {
   // This class assumes it does not deal with internal keyboards.
   CHECK(!has_keyboard_ || type() != INPUT_DEVICE_INTERNAL);
 
   memset(&evdev_, 0, sizeof(evdev_));
   evdev_.log = OnLogMessage;
   evdev_.log_udata = this;
   evdev_.syn_report = OnSynReport;
   evdev_.syn_report_udata = this;
-  evdev_.fd = fd;
+  evdev_.fd = fd.release();

[kpschoedel, 2017/01/18 21:31:07]

evdev_ owns the fd now, and EvdevClose closes it?

[spang, 2017/01/18 22:05:37]

Correct.
https://cs.corp.google.com/chromeos_public/src/platform/libevdev/src/libevdev...

 
   memset(&evstate_, 0, sizeof(evstate_));
   evdev_.evstate = &evstate_;
   Event_Init(&evdev_);
 
   Event_Open(&evdev_);
 
   delegate_->OnLibEvdevCrosOpen(&evdev_, &evstate_);
 }
 
 EventReaderLibevdevCros::~EventReaderLibevdevCros() {
   DCHECK(!watching_);
   EvdevClose(&evdev_);
-  fd_ = -1;
 }
 
 EventReaderLibevdevCros::Delegate::~Delegate() {}
 
 void EventReaderLibevdevCros::OnFileCanReadWithoutBlocking(int fd) {
   TRACE_EVENT1("evdev", "EventReaderLibevdevCros::OnFileCanReadWithoutBlocking",
                "fd", fd);
 
   if (EvdevRead(&evdev_)) {
     if (errno == EINTR || errno == EAGAIN)
@@ skipping 46 matching lines @@
   if (level >= LOGLEVEL_ERROR)
     LOG(ERROR) << "libevdev: " << FormatLog(fmt, args);
   else if (level >= LOGLEVEL_WARNING)
     LOG(WARNING) << "libevdev: " << FormatLog(fmt, args);
   else
     VLOG(3) << "libevdev: " << FormatLog(fmt, args);
   va_end(args);
 }
 
 }  // namespace ui