From 4b23f18d2c9e13ac6f33fb45dbb79931082125bb Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 14 Feb 2019 14:13:08 +0100 Subject: [PATCH] qemu_hotplug: Initialize @charAlias in qemuDomainRemoveChrDevice My change in 112f3a8d0f32 was too drastic. The @charAlias variable is initialized only if @monitor == true. However, it is used even outside of that condition, at which point it's just uninitialized pointer. Reported-by: John Ferlan Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- src/qemu/qemu_hotplug.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a5c352f44b..78c9a77f2d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4754,13 +4754,12 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing character device %s from domain %p %s", chr->info.alias, vm, vm->def->name); - if (monitor) { - if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias))) - goto cleanup; + if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias))) + goto cleanup; + if (monitor) { qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDetachCharDev(priv->mon, charAlias); - if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; } -- 2.39.5