From 776b831d89ff873ce1daf4e65e5eb13e808914a7 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 9 Sep 2020 18:46:39 +0200 Subject: osc52: unset (clear) selection when an invalid payload is received --- osc.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'osc.c') diff --git a/osc.c b/osc.c index 50d6ab3b..c04c8069 100644 --- a/osc.c +++ b/osc.c @@ -23,17 +23,6 @@ static void osc_to_clipboard(struct terminal *term, const char *target, const char *base64_data) { - char *decoded = base64_decode(base64_data); - if (decoded == NULL) { - if (errno == EINVAL) - LOG_WARN("OSC: invalid clipboard data: %s", base64_data); - else - LOG_ERRNO("base64_decode() failed"); - return; - } - - LOG_DBG("decoded: %s", decoded); - bool to_clipboard = false; bool to_primary = false; @@ -71,6 +60,22 @@ osc_to_clipboard(struct terminal *term, const char *target, return; } + char *decoded = base64_decode(base64_data); + if (decoded == NULL) { + if (errno == EINVAL) + LOG_WARN("OSC: invalid clipboard data: %s", base64_data); + else + LOG_ERRNO("base64_decode() failed"); + + if (to_clipboard) + selection_clipboard_unset(seat); + if (to_primary) + selection_primary_unset(seat); + return; + } + + LOG_DBG("decoded: %s", decoded); + if (to_clipboard) { char *copy = xstrdup(decoded); if (!text_to_clipboard(seat, term, copy, seat->kbd.serial)) -- cgit v1.3