aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Rogers <brogers@suse.com>2021-02-12 20:23:18 -0700
committerGerd Hoffmann <kraxel@redhat.com>2021-02-19 15:00:13 +0100
commit122e4ef6dea14a078a860ca253852e18ddebb8e2 (patch)
tree517ea930b3c6f6a9004cd1ec71cac56be86f7843
parentc0ff29d1889040a61a7120731ac16e0c1da39149 (diff)
downloadqemu-122e4ef6dea14a078a860ca253852e18ddebb8e2.zip
qemu-122e4ef6dea14a078a860ca253852e18ddebb8e2.tar.gz
qemu-122e4ef6dea14a078a860ca253852e18ddebb8e2.tar.bz2
spice-app: avoid crash when core spice module doesn't loaded
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>
-rw-r--r--ui/spice-app.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/spice-app.c b/ui/spice-app.c
index 026124e..4325ac2 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);