37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Fri, 28 Apr 2023 19:48:06 +0400
|
|
Subject: [PATCH] ui: return NULL when getting cursor without a console
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
VNC may try to get the current cursor even when there are no consoles
|
|
and crashes. Simple reproducer is qemu with -nodefaults.
|
|
|
|
Fixes: (again)
|
|
https://gitlab.com/qemu-project/qemu/-/issues/1548
|
|
|
|
Fixes: commit 385ac97f8 ("ui: keep current cursor with QemuConsole")
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
(picked up from https://lists.nongnu.org/archive/html/qemu-devel/2023-04/msg05598.html)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
ui/console.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ui/console.c b/ui/console.c
|
|
index e173731e20..7461446e71 100644
|
|
--- a/ui/console.c
|
|
+++ b/ui/console.c
|
|
@@ -2306,7 +2306,7 @@ QEMUCursor *qemu_console_get_cursor(QemuConsole *con)
|
|
if (con == NULL) {
|
|
con = active_console;
|
|
}
|
|
- return con->cursor;
|
|
+ return con ? con->cursor : NULL;
|
|
}
|
|
|
|
bool qemu_console_is_visible(QemuConsole *con)
|