leyoda/smithay-clipboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the crash when there's no focus on a seat

Browse source 
If the user asks for clipboard data with neither wl_keyboard
nor wl_pointer focus being presented on a seat, we should ignore the
request and reply with error, instead of crashing.
This commit is contained in:
Kirill Chibisov 2020-08-05 22:39:43 +03:00 • committed by Victor Berger
parent 40d0f2afc5
commit 7fc533d55f
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
- Fixed clipboard crashing, when seat has neither keyboard nor pointer focus
## 0.5.1 -- 2020-07-10 ## 0.5.1 -- 2020-07-10
- Fixed clipboard not working, when seat had empty name - Fixed clipboard not working, when seat had empty name

13
src/worker/mod.rs
View file

@ -216,7 +216,14 @@ fn worker_impl(display: Display, request_rx: Receiver<Command>, reply_tx: Sender
.unwrap(); .unwrap();
// Get latest observed seat and serial. // Get latest observed seat and serial.
let (seat, serial) = dispatch_data.last_seat().unwrap(); let (seat, serial) = match dispatch_data.last_seat() {
Some(data) => data,
None => {
handlers::reply_error(&reply_tx, "no focus on a seat.");
continue;
}
};
let serial = *serial; let serial = *serial;
// Handle requests. // Handle requests.
@ -225,7 +232,7 @@ fn worker_impl(display: Display, request_rx: Receiver<Command>, reply_tx: Sender
if data_device_manager.is_some() { if data_device_manager.is_some() {
handle_load!(env, with_data_device, seat, queue, reply_tx); handle_load!(env, with_data_device, seat, queue, reply_tx);
} else { } else {
handlers::reply_error(&reply_tx, "Clipboard is not available"); handlers::reply_error(&reply_tx, "clipboard is not available.");
} }
} }
Command::Store(contents) => { Command::Store(contents) => {
@ -246,7 +253,7 @@ fn worker_impl(display: Display, request_rx: Receiver<Command>, reply_tx: Sender
if primary_selection_manager.is_some() { if primary_selection_manager.is_some() {
handle_load!(env, with_primary_selection, seat, queue, reply_tx); handle_load!(env, with_primary_selection, seat, queue, reply_tx);
} else { } else {
handlers::reply_error(&reply_tx, "Primary clipboard is not available"); handlers::reply_error(&reply_tx, "primary clipboard is not available.");
} }
} }
Command::StorePrimary(contents) => { Command::StorePrimary(contents) => {