From 814fcb9e08fdc80ff2d74d5ca205b9c8bd0d351c Mon Sep 17 00:00:00 2001 From: Alex Jia Date: Fri, 30 Mar 2012 17:10:31 +0800 Subject: [PATCH] conf: Prevent crash of libvirtd without channel target name * src/conf/domain_conf.c (virDomainChannelDefCheckABIStability): avoid crashing libvirtd due to derefing a NULL pointer. For details, please see bug: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=808371 Signed-off-by: Alex Jia --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 24e10e6ecc..4caef6f75b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9597,10 +9597,10 @@ static bool virDomainChannelDefCheckABIStability(virDomainChrDefPtr src, switch (src->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (STRNEQ(src->target.name, dst->target.name)) { + if (STRNEQ_NULLABLE(src->target.name, dst->target.name)) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target channel name %s does not match source %s"), - dst->target.name, src->target.name); + NULLSTR(dst->target.name), NULLSTR(src->target.name)); goto cleanup; } break;