diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-09-11 18:04:47 +0400 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-09-20 10:18:14 +0300 |
commit | 6c575436cd3e692079fc3e2fe4f54efe77211549 (patch) | |
tree | dc56ab7244829cfca564aeadd63e24ed76a2ce7f | |
parent | 36540b367eb80f1d6a646f691e6a2b75bf57ad61 (diff) | |
download | qemu-6c575436cd3e692079fc3e2fe4f54efe77211549.zip qemu-6c575436cd3e692079fc3e2fe4f54efe77211549.tar.gz qemu-6c575436cd3e692079fc3e2fe4f54efe77211549.tar.bz2 |
ui: fix crash when there are no active_console
Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
0x0000555555888630 in dpy_ui_info_supported (con=0x0) at ../ui/console.c:812
812 return con->hw_ops->ui_info != NULL;
(gdb) bt
#0 0x0000555555888630 in dpy_ui_info_supported (con=0x0) at ../ui/console.c:812
#1 0x00005555558a44b1 in protocol_client_msg (vs=0x5555578c76c0, data=0x5555581e93f0 <incomplete sequence \373>, len=24) at ../ui/vnc.c:2585
#2 0x00005555558a19ac in vnc_client_read (vs=0x5555578c76c0) at ../ui/vnc.c:1607
#3 0x00005555558a1ac2 in vnc_client_io (ioc=0x5555581eb0e0, condition=G_IO_IN, opaque=0x5555578c76c0) at ../ui/vnc.c:1635
Fixes:
https://issues.redhat.com/browse/RHEL-2600
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Albert Esteve <aesteve@redhat.com>
(cherry picked from commit 48a35e12faf90a896c5aa4755812201e00d60316)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r-- | ui/console.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/console.c b/ui/console.c index 7461446..a327c9f 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1707,6 +1707,9 @@ bool dpy_ui_info_supported(QemuConsole *con) if (con == NULL) { con = active_console; } + if (con == NULL) { + return false; + } return con->hw_ops->ui_info != NULL; } |