Merge #2094

2094: [input] Handle exceptions while handling udev events r=Saviq a=AlanGriffiths By design, the event dispatcher does not expect exceptions to propagate. Fix a dispatchee that allows events to propagate. Maybe fixes canonical/mir-kiosk#60 Co-authored-by: Alan Griffiths <[email protected]>
canonical · Jun 30, 2021 · c2faa29 · c2faa29
1 parent 1b8f979
commit c2faa29
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/platforms/evdev/platform.cpp b/src/platforms/evdev/platform.cpp
@@ -289,11 +289,16 @@ void mie::Platform::start()
         std::make_shared<DispatchableUDevMonitor>(
             *udev_context,
             [this](auto type, auto const& device)
+        {
+            using namespace std::string_literals;
+            auto event_type= "unknown"s;
+            try
             {
-                switch(type)
+                switch (type)
                 {
                 case mu::Monitor::ADDED:
                 {
+                    event_type = "ADDED"s;
                     if (device.devnode())
                     {
                         /*
@@ -341,6 +346,7 @@ void mie::Platform::start()
                 }
                 case mu::Monitor::REMOVED:
                 {
+                    event_type = "REMOVED"s;
                     for (auto const& input_device : this->devices)
                     {
                         auto device_udev = libinput_device_get_udev_device(input_device->device());
@@ -359,7 +365,13 @@ void mie::Platform::start()
                 default:
                     break;
                 }
-            });
+            }
+            catch (std::exception const& e)
+            {
+                auto const message = "Failed to handle UDev " + event_type + " event for " + device.syspath();
+                log(logging::Severity::warning, MIR_LOG_COMPONENT, std::make_exception_ptr(e), message);
+            }
+        });
 
     platform_dispatchable->add_watch(udev_dispatchable);
     platform_dispatchable->add_watch(libinput_dispatchable);