From 2e70af12f2d63eaba2294481762fe1df8b5c0e3e Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 14 Mar 2016 09:34:43 +0100 Subject: [PATCH] qemuBuildVideoCommandLine: Don't access def->videos without check This function can be called over a domain definition that has no video configured. The tests/qemuxml2argvdata/qemuxml2argv-minimal.xml file could serve as an example. Problem is, before the check that domain has some or none video configured, def->videos is dereferenced causing a segmentation fault in case there's none video configured. Signed-off-by: Michal Privoznik --- src/qemu/qemu_command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ba8c216281..32d32b16c3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3809,7 +3809,7 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { size_t i; - int primaryVideoType = def->videos[0]->type; + int primaryVideoType; if (!def->nvideos) { /* If we have -device, then we set -nodefaults already */ @@ -3819,6 +3819,8 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, return 0; } + primaryVideoType = def->videos[0]->type; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY) && ((primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA)) || -- 2.39.5