mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-23 05:33:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'clipboard-ignore-unhandled-mime-types'

Browse source 
Closes #230
This commit is contained in:
Daniel Eklöf 2020-12-01 18:30:29 +01:00
commit 1f6a663bed
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -113,6 +113,8 @@ means foot can be PGO:d in e.g. sandboxed build scripts. See
* `footclient` `-m` (`--maximized`) flag being ignored. * `footclient` `-m` (`--maximized`) flag being ignored.
* Crash with explicitly sized sixels with a height less than 6 pixels. * Crash with explicitly sized sixels with a height less than 6 pixels.
* Key mappings for `esc` with modifiers. * Key mappings for `esc` with modifiers.
* Crash when pasting non-textual clipboard content
(https://codeberg.org/dnkl/foot/issues/230).
### Security ### Security

8
selection.c
View file

@ -1370,7 +1370,9 @@ text_from_clipboard(struct seat *seat, struct terminal *term,
void (*done)(void *user), void *user) void (*done)(void *user), void *user)
{ {
struct wl_clipboard *clipboard = &seat->clipboard; struct wl_clipboard *clipboard = &seat->clipboard;
if (clipboard->data_offer == NULL) { if (clipboard->data_offer == NULL ||
clipboard->mime_type == DATA_OFFER_MIME_UNSET)
{
done(user); done(user);
return; return;
} }
@ -1512,7 +1514,9 @@ text_from_primary(
} }
struct wl_primary *primary = &seat->primary; struct wl_primary *primary = &seat->primary;
if (primary->data_offer == NULL){ if (primary->data_offer == NULL ||
primary->mime_type == DATA_OFFER_MIME_UNSET)
{
done(user); done(user);
return; return;
} }