]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
vbox: Fix possible NULL deref
authorJohn Ferlan <jferlan@redhat.com>
Sun, 3 Nov 2019 12:05:15 +0000 (07:05 -0500)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 6 Nov 2019 16:27:12 +0000 (11:27 -0500)
The @valueTypeUtf8 references need to use the STREQ_NULLABLE since
they're variantly filled in by @valueTypeUtf16.

Found by Coverity.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
src/vbox/vbox_common.c

index 5486e5ff3be78925bc22e05a519ed9c7332d327e..cdbec15daec0a4cafaf4b631920db166c9a6265c 100644 (file)
@@ -3509,13 +3509,13 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
                 VBOX_UTF8_FREE(valueDisplayUtf8);
         }
 
-        if (STREQ(valueTypeUtf8, "sdl")) {
+        if (STREQ_NULLABLE(valueTypeUtf8, "sdl")) {
             graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
             graphics->data.sdl.display = valueDisplayUtf8;
             valueDisplayUtf8 = NULL;
         }
 
-        if (STREQ(valueTypeUtf8, "gui")) {
+        if (STREQ_NULLABLE(valueTypeUtf8, "gui")) {
             graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP;
             graphics->data.desktop.display = valueDisplayUtf8;
             valueDisplayUtf8 = NULL;