]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
ui: return NULL when getting cursor without a console
authorMarc-André Lureau <marcandre.lureau@redhat.com>
Sun, 19 Mar 2023 11:10:17 +0000 (15:10 +0400)
committerMichael Tokarev <mjt@tls.msk.ru>
Wed, 28 Jun 2023 15:50:48 +0000 (18:50 +0300)
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>
Message-Id: <20230428154807.2143652-1-marcandre.lureau@redhat.com>
(cherry picked from commit 333e7599a0d723801235f675719008ce43db93e3)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
ui/console.c

index e173731e2056a0edf1bedc6b1934e322da7fbe42..7461446e711fc990b384f58d12d8dcf35cea9c7b 100644 (file)
@@ -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)