c98850e210
- hw/nvme: Avoid dynamic stack allocation - ppc/vof: Fix missed fields in VOF cleanup - ui: fix crash when there are no active_console - tests/qtest/pflash: Clean up local variable shadowing - target/ppc: Fix the order of kvm_enable judgment about kvmppc_set_interrupt() - tulip: Assign default MAC address if not specified - hw/char: fix qcode array bounds check in ESCC impl Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 89fda5a4410099a317bd1fcef56b130d6d97a2b5 Mon Sep 17 00:00:00 2001
|
|
From: dinglimin_yewu <dinglimin_yewu@cmss.chinamobile.com>
|
|
Date: Sat, 16 Sep 2023 17:41:07 +0800
|
|
Subject: [PATCH] ui: fix crash when there are no active_console
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry-pick from 48a35e12faf90a896c5aa4755812201e00d60316
|
|
|
|
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
|
|
|
|
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>
|
|
Signed-off-by: dinglimin_yewu <dinglimin_yewu@cmss.chinamobile.com>
|
|
---
|
|
ui/console.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/ui/console.c b/ui/console.c
|
|
index 29a3e3f0f5..d22c3def20 100644
|
|
--- a/ui/console.c
|
|
+++ b/ui/console.c
|
|
@@ -1526,6 +1526,9 @@ bool dpy_ui_info_supported(QemuConsole *con)
|
|
con = active_console;
|
|
}
|
|
|
|
+ if (con == NULL) {
|
|
+ return false;
|
|
+ }
|
|
return con->hw_ops->ui_info != NULL;
|
|
}
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|