| Message ID | 20230912062836.1530898-1-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] ui: fix crash when there are no active_console | expand |
On Tue, Sep 12, 2023 at 8:28 AM <marcandre.lureau@redhat.com> wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > 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> > --- > ui/console.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/ui/console.c b/ui/console.c > index 90ae4be602..0fbec4d0bd 100644 > --- a/ui/console.c > +++ b/ui/console.c > @@ -808,6 +808,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 > > Reviewed-by: Albert Esteve <aesteve@redhat.com>
diff --git a/ui/console.c b/ui/console.c index 90ae4be602..0fbec4d0bd 100644 --- a/ui/console.c +++ b/ui/console.c @@ -808,6 +808,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; }