Skip to content

Commit 975cae1

Browse files
committed
Fix clipboard paste metadata for qrexec (Windows)
fixes: QubesOS/qubes-issues#9844
1 parent ced89d2 commit 975cae1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

gui-daemon/xside.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,17 +1179,17 @@ static int fetch_qubes_clipboard_using_qrexec(Ghandles * g) {
11791179
static int paste_qubes_clipboard_using_qrexec(Ghandles * g) {
11801180
int ret;
11811181
struct clipboard_metadata metadata = {0};
1182+
strcpy(metadata.vmname, g->vmname);
1183+
metadata.paste_action = true;
1184+
metadata.qrexec_clipboard = true;
1185+
metadata.xevent_timestamp = g->clipboard_xevent_time;
1186+
metadata.buffer_size = g->clipboard_buffer_size;
1187+
metadata.protocol_version_vmside = g->protocol_version;
1188+
metadata.protocol_version_xside = PROTOCOL_VERSION(
1189+
PROTOCOL_VERSION_MAJOR, PROTOCOL_VERSION_MINOR);
11821190

11831191
ret = run_clipboard_rpc(g, CLIPBOARD_PASTE);
11841192
if (ret) {
1185-
strcpy(metadata.vmname, g->vmname);
1186-
metadata.paste_action = true;
1187-
metadata.qrexec_clipboard = true;
1188-
metadata.xevent_timestamp = g->clipboard_xevent_time;
1189-
metadata.buffer_size = g->clipboard_buffer_size;
1190-
metadata.protocol_version_vmside = g->protocol_version;
1191-
metadata.protocol_version_xside = PROTOCOL_VERSION(
1192-
PROTOCOL_VERSION_MAJOR, PROTOCOL_VERSION_MINOR);
11931193
metadata.successful = true;
11941194
clear_clipboard(&metadata);
11951195
}

0 commit comments

Comments
 (0)