NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vbox: Fix possible NULL deref

Browse Source 
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>
This commit is contained in:
John Ferlan 2019-11-03 07:05:15 -05:00
parent f5420e60f2
commit 18a1ce77b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vbox/vbox_common.c
View File

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