From ce32d2b77a636f88a0a7975f004de1533ed5c385 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Thu, 28 Mar 2024 14:55:49 +0100 Subject: [PATCH] clipboard-manager: Make sure we always have mimetype The precondition checks in meta_selection_source_memory_new can return NULL if the mimetype is NULL but callers expect the error to be set when NULL is returned. Let's just make sure we never call it with a NULL mimetype. Part-of: --- src/core/meta-clipboard-manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/meta-clipboard-manager.c b/src/core/meta-clipboard-manager.c index 8485f3725..926a91ef4 100644 --- a/src/core/meta-clipboard-manager.c +++ b/src/core/meta-clipboard-manager.c @@ -126,7 +126,7 @@ owner_changed_cb (MetaSelection *selection, } } - if (best_idx < 0) + if (!best) { g_list_free_full (mimetypes, g_free); return; @@ -149,6 +149,8 @@ owner_changed_cb (MetaSelection *selection, g_autoptr (GError) error = NULL; g_autoptr (MetaSelectionSource) new_source = NULL; + g_assert (display->saved_clipboard_mimetype != NULL); + /* Old owner is gone, time to take over */ new_source = meta_selection_source_memory_new (display->saved_clipboard_mimetype, display->saved_clipboard,