56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
|
From 8a233fd50c4ab973ef4a3c4ac7daf83e5c90aabc Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||
|
|
Date: Mon, 11 Sep 2023 18:04:47 +0400
|
||
|
|
Subject: [PATCH 4/4] ui: fix crash when there are no active_console
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
RH-MergeRequest: 338: ui: fix crash when there are no active_console
|
||
|
|
RH-Jira: RHEL-2600
|
||
|
|
RH-Acked-by: Gerd Hoffmann <None>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Commit: [1/1] c58d1d76558dbc7ee2a8193a1e7a9b87a79ac385
|
||
|
|
|
||
|
|
JIRA: https://issues.redhat.com/browse/RHEL-2600
|
||
|
|
|
||
|
|
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: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
---
|
||
|
|
ui/console.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/ui/console.c b/ui/console.c
|
||
|
|
index 29a3e3f0f5..df3426bd8a 100644
|
||
|
|
--- a/ui/console.c
|
||
|
|
+++ b/ui/console.c
|
||
|
|
@@ -1525,6 +1525,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;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|