From 10c869b672c3633a2dfc2a6753a2164fd28887cb Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Wed, 17 Apr 2024 15:35:51 +0200
Subject: [PATCH] wayland: ignore invalid activation tokens

---
 src/ifs/xdg_activation_v1.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ifs/xdg_activation_v1.rs b/src/ifs/xdg_activation_v1.rs
index 184cf76d..b263e682 100644
--- a/src/ifs/xdg_activation_v1.rs
+++ b/src/ifs/xdg_activation_v1.rs
@@ -5,7 +5,7 @@ use {
         ifs::xdg_activation_token_v1::XdgActivationTokenV1,
         leaks::Tracker,
         object::{Object, Version},
-        utils::{activation_token::ActivationToken, opaque::OpaqueError},
+        utils::{activation_token::ActivationToken, errorfmt::ErrorFmt, opaque::OpaqueError},
         wire::{xdg_activation_v1::*, XdgActivationV1Id},
     },
     std::rc::Rc,
@@ -84,7 +84,13 @@ impl XdgActivationV1RequestHandler for XdgActivationV1 {
     }
 
     fn activate(&self, req: Activate, _slf: &Rc<Self>) -> Result<(), Self::Error> {
-        let token: ActivationToken = req.token.parse()?;
+        let token: ActivationToken = match req.token.parse() {
+            Ok(t) => t,
+            Err(e) => {
+                log::warn!("Could not parse client activation token: {}", ErrorFmt(e));
+                return Ok(());
+            }
+        };
         let surface = self.client.lookup(req.surface)?;
         if self.client.state.activation_tokens.remove(&token).is_none() {
             log::warn!(