From 9cbf24690b8b7b306fc618d732ce6b492a072a22 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Wed, 12 Aug 2026 04:54:57 +1000
Subject: [PATCH] [client] x11: reject null clipboard payloads

---
 client/displayservers/X11/clipboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/displayservers/X11/clipboard.c b/client/displayservers/X11/clipboard.c
index 987ab5e6..d66c103b 100644
--- a/client/displayservers/X11/clipboard.c
+++ b/client/displayservers/X11/clipboard.c
@@ -582,7 +582,7 @@ static void x11CBSelectionNotify(const XSelectionEvent e)
 
   const LG_ClipboardRequest request = x11cb.read.request;
   const bool valid = dataType != LG_CLIPBOARD_DATA_NONE &&
-    dataType == x11cb.read.type && format == 8;
+    dataType == x11cb.read.type && format == 8 && (!itemCount || data);
   cancelReadNL();
   LG_UNLOCK(x11cb.lock);