From nobody Fri May 17 01:25:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620216696; cv=none; d=zohomail.com; s=zohoarc; b=OBBueDk4Gl2ZnvpaMkXZp+qqpvry9eWcK9pAMVJOg135BvFAHgT55yUc3LPQS0IJNF3sQEBgLebptAnF4glLerWAvyMQCOD3rvwhSyyRbJ/uH8Ug4Nw7GiF0hmTLKznFOg4n6Zc3pECI2M0Aud3qK8FBvGUEJNVPpWERysq14Sc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620216696; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Q5TCWpE1V+lfrFElGnZyFj/lj0PbnXfHEikZCQyrgH8=; b=fSuGwWbOhhM9wP0X5szd+BuHlGnKS6C1Dx5HtzQktXu8CxdFnIy+mFZS/fzEFPPZZeqDwbZoIHP1pCVsaBnxSarBilCtv/3WZGUvgfzekhm0/ikStz/gdCtDu9JD205sC9WnWorBKbebN2B1uVVDlnj5+zHXNw82xdG0N9FcBxc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620216696527162.05459681986747; Wed, 5 May 2021 05:11:36 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-566-qDx_IQMrP7ytcD2QVtMWMg-1; Wed, 05 May 2021 08:11:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7AE4D18BA280; Wed, 5 May 2021 12:11:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0B3EF18825; Wed, 5 May 2021 12:11:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 596A7EDBD; Wed, 5 May 2021 12:11:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 145CBKdC004328 for ; Wed, 5 May 2021 08:11:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D7955D705; Wed, 5 May 2021 12:11:20 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00F2C5D6D1 for ; Wed, 5 May 2021 12:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620216695; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Q5TCWpE1V+lfrFElGnZyFj/lj0PbnXfHEikZCQyrgH8=; b=WV9zVyeqNjMOpe4LsbJuPDXf2ktSVJLKh03XwaGoVwVN5+vn4+aMzlbjvd0h95R7ubWWs0 wT0F5PqaLkcCfSU9uo0svEfCiggtxPhRCORH8+lrDYEz8fni2QmknejODMO22sYqG0341M /2OGnAoDisHGJzXjaWcwESXDtsIEb0Y= X-MC-Unique: qDx_IQMrP7ytcD2QVtMWMg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] virDomainVideoDriverDefParseXML: Fix use of uninitialized variable Date: Wed, 5 May 2021 14:11:15 +0200 Message-Id: <7f71a641d0809924acbe899ddebe46babb3ee4e9.1620216656.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit fc7e1b2f03cfe2a5f3fce737390548505382d8ed which refactored the video driver parse helper introduced a use of uninitialized variable, which caused test failure at least when compiled with clang. Pass 'def->vgaconf' directly to virXMLPropEnum. 'def' needs to be converted to use g_autofree to handle error scenarios. Signed-off-by: Peter Krempa --- Pushed under the build-breaker fix rule. src/conf/domain_conf.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 64f525fc08..d5d8bd0a01 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14313,8 +14313,7 @@ static virDomainVideoDriverDef * virDomainVideoDriverDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { - virDomainVideoDriverDef *def; - unsigned int val; + g_autofree virDomainVideoDriverDef *def =3D NULL; xmlNodePtr driver =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) @@ -14323,15 +14322,14 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node, if (!(driver =3D virXPathNode("./driver", ctxt))) return NULL; + def =3D g_new0(virDomainVideoDriverDef, 1); + if (virXMLPropEnum(driver, "vgaconf", virDomainVideoVGAConfTypeFromString, - VIR_XML_PROP_NONZERO, &val) < 0) + VIR_XML_PROP_NONZERO, &def->vgaconf) < 0) return NULL; - def =3D g_new0(virDomainVideoDriverDef, 1); - def->vgaconf =3D val; - - return def; + return g_steal_pointer(&def); } static virDomainVideoDef * --=20 2.30.2