ui: fix crash when there are no active_console

elmarco · elmarco · commit 48a35e12faf9 · 2023-09-12T11:13:52.000+04:00
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>
diff --git a/ui/console.c b/ui/console.c
@@ -806,6 +806,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -806,6 +806,9 @@ bool dpy_ui_info_supported(QemuConsole *con)`
`806`	`806`	`if (con == NULL) {`
`807`	`807`	`con = active_console;`
`808`	`808`	`}`
	`809`	`+ if (con == NULL) {`
	`810`	`+ return false;`
	`811`	`+ }`
`809`	`812`
`810`	`813`	`return con->hw_ops->ui_info != NULL;`
`811`	`814`	`}`