[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/8] ui/vnc-clipboard: fix adding notifier twice
From: |
Gerd Hoffmann |
Subject: |
[PULL 4/8] ui/vnc-clipboard: fix adding notifier twice |
Date: |
Mon, 22 Nov 2021 13:40:11 +0100 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
vnc_server_cut_text_caps() is not guaranteed to be called only once.
If it called twice, we finally call notifier_list_add() twice with same
element. Which leads to loopback QLIST. So, on next
notifier_list_notify() we'll loop forever and QEMU stuck.
So, let's only register new notifier if it's not yet registered.
Note, that similar check is used in vdagent_chr_recv_caps() (before
call qemu_clipboard_peer_register()), and also before
qemu_clipboard_peer_unregister() call in vdagent_disconnect() and in
vnc_disconnect_finish().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20211110103800.2266729-1-vsementsov@virtuozzo.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc-clipboard.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c
index 9f077965d056..67284b556cd8 100644
--- a/ui/vnc-clipboard.c
+++ b/ui/vnc-clipboard.c
@@ -316,8 +316,10 @@ void vnc_server_cut_text_caps(VncState *vs)
caps[1] = 0;
vnc_clipboard_send(vs, 2, caps);
- vs->cbpeer.name = "vnc";
- vs->cbpeer.update.notify = vnc_clipboard_notify;
- vs->cbpeer.request = vnc_clipboard_request;
- qemu_clipboard_peer_register(&vs->cbpeer);
+ if (!vs->cbpeer.update.notify) {
+ vs->cbpeer.name = "vnc";
+ vs->cbpeer.update.notify = vnc_clipboard_notify;
+ vs->cbpeer.request = vnc_clipboard_request;
+ qemu_clipboard_peer_register(&vs->cbpeer);
+ }
}
--
2.33.1
- [PULL 0/8] Fixes 20211122 patches, Gerd Hoffmann, 2021/11/22
- [PULL 1/8] ui: fix incorrect scaling on highdpi with gtk/opengl, Gerd Hoffmann, 2021/11/22
- [PULL 3/8] ui/gtk: graphic_hw_gl_flushed after closing dmabuf->fence_fd, Gerd Hoffmann, 2021/11/22
- [PULL 2/8] ui: fix incorrect pointer position on highdpi with gtk, Gerd Hoffmann, 2021/11/22
- [PULL 5/8] migration: fix dump-vmstate with modules, Gerd Hoffmann, 2021/11/22
- [PULL 4/8] ui/vnc-clipboard: fix adding notifier twice,
Gerd Hoffmann <=
- [PULL 7/8] microvm: add missing g_free() call, Gerd Hoffmann, 2021/11/22
- [PULL 6/8] hw/i386/microvm: Reduce annoying debug message in dt_setup_microvm(), Gerd Hoffmann, 2021/11/22
- [PULL 8/8] microvm: check g_file_set_contents() return value, Gerd Hoffmann, 2021/11/22
- Re: [PULL 0/8] Fixes 20211122 patches, Richard Henderson, 2021/11/22