[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/8] spice-app: avoid crash when core spice module doesn't loaded
From: |
Gerd Hoffmann |
Subject: |
[PULL 5/8] spice-app: avoid crash when core spice module doesn't loaded |
Date: |
Fri, 19 Feb 2021 23:00:33 +0100 |
From: Bruce Rogers <brogers@suse.com>
When qemu is built with modules, but a given module doesn't load
qemu should handle that gracefully. When ui-spice-core.so isn't
able to be loaded and qemu is invoked with -display spice-app or
-spice, qemu will dereference a null pointer. With this change we
check the pointer before dereferencing and error out in a normal
way.
Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210213032318.346093-1-brogers@suse.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/spice-app.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ui/spice-app.c b/ui/spice-app.c
index 026124ef56a0..4325ac2d9c54 100644
--- a/ui/spice-app.c
+++ b/ui/spice-app.c
@@ -129,6 +129,7 @@ static void spice_app_atexit(void)
static void spice_app_display_early_init(DisplayOptions *opts)
{
QemuOpts *qopts;
+ QemuOptsList *list;
GError *err = NULL;
if (opts->has_full_screen) {
@@ -159,11 +160,16 @@ static void spice_app_display_early_init(DisplayOptions
*opts)
exit(1);
}
}
+ list = qemu_find_opts("spice");
+ if (list == NULL) {
+ error_report("spice-app missing spice support");
+ exit(1);
+ }
type_register(&char_vc_type_info);
sock_path = g_strjoin("", app_dir, "/", "spice.sock", NULL);
- qopts = qemu_opts_create(qemu_find_opts("spice"), NULL, 0, &error_abort);
+ qopts = qemu_opts_create(list, NULL, 0, &error_abort);
qemu_opt_set(qopts, "disable-ticketing", "on", &error_abort);
qemu_opt_set(qopts, "unix", "on", &error_abort);
qemu_opt_set(qopts, "addr", sock_path, &error_abort);
--
2.29.2
- [PULL 0/8] Ui 20210219 patches, Gerd Hoffmann, 2021/02/19
- [PULL 3/8] ui/cocoa: Support unique keys of JIS keyboards, Gerd Hoffmann, 2021/02/19
- [PULL 4/8] ui/cocoa: Do not copy members of pixman image, Gerd Hoffmann, 2021/02/19
- [PULL 2/8] spice: flush drawing before notifying client, Gerd Hoffmann, 2021/02/19
- [PULL 7/8] ui/cocoa: Statically allocate dcl, Gerd Hoffmann, 2021/02/19
- [PULL 8/8] ui/console: Remove dpy_gl_ctx_get_current, Gerd Hoffmann, 2021/02/19
- [PULL 6/8] ui/cocoa: Interpret left button down as is when command is pressed, Gerd Hoffmann, 2021/02/19
- [PULL 1/8] spice: flush on GL update before notifying client, Gerd Hoffmann, 2021/02/19
- [PULL 5/8] spice-app: avoid crash when core spice module doesn't loaded,
Gerd Hoffmann <=
- Re: [PULL 0/8] Ui 20210219 patches, Peter Maydell, 2021/02/20