From nobody Sun Feb 8 20:59:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1614183616; cv=none; d=zohomail.com; s=zohoarc; b=BaGzEFbBWeNKD93oDVufV0C+But/cS/Ie0bECgfbTWS7rPF/aQL8RO7WuOVzuLfX1vGtqGIQofrOHVStyaq1UP7pEX3l1LqNQvGjJGxI+gc8/eJuuMbpcTrG//bP+Qv9DlieXNlaTLs0QGf7D3FePJy0Pqevm8yxr25cgffWqno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614183616; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D3m619v+RxMB8hmKNdHj9s9T8o7xBEAYxxH4WPmkr6c=; b=FSadGE8Y4wifg4PQcOtHjNlNHtxCa45uy+ZP0yoD04k/0iKb0lshAZiY/IHi2wMmObPsfqDi6Lal2MuxskYRMabWVm/NuOMQ4IQa76JvRimmqeTH4iT+rrWKiJMajY7lsf1rW1mBYbrj9qSVgjtxSsyc6Ks15X6NrAYKgXl5qUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1614183616426347.2691509386133; Wed, 24 Feb 2021 08:20:16 -0800 (PST) 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-353-nYzKZs-uMyaIt00WKAP7Hw-1; Wed, 24 Feb 2021 11:17:58 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 773851030BD0; Wed, 24 Feb 2021 16:17:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A1D9100239A; Wed, 24 Feb 2021 16:17:51 +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 0E01C18077CE; Wed, 24 Feb 2021 16:17:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11OGHh7q015638 for ; Wed, 24 Feb 2021 11:17:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 372AE60CDE; Wed, 24 Feb 2021 16:17:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CE0760862 for ; Wed, 24 Feb 2021 16:17:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614183615; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D3m619v+RxMB8hmKNdHj9s9T8o7xBEAYxxH4WPmkr6c=; b=NpML/plc6dmBEhmksBpveDArIAPjtEgxJpaSrv4GVIQnkpHpU+wvtcY+SRZebL0F5zhCg4 kU6aFl0RskOTv61q0ls8KbTKDDosCzGR6EFibH+/Cgl4sTmRat1pxSINa2WxSRvXbNlnOv rD7WOeT0iy/iwl/h4gywbCUEwd9toLk= X-MC-Unique: nYzKZs-uMyaIt00WKAP7Hw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/33] util: xml: Add virXMLBufferCreate wrapper Date: Wed, 24 Feb 2021 17:16:53 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.84 on 10.5.11.22 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" 'xmlBufferCreate' returns NULL only on allocation failure. Add a wrapper which will call 'abort()' in such case in a centralised spot. It doesn't make much sense to continue execution from here. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 5 +---- src/conf/network_conf.c | 5 +---- src/libvirt_private.syms | 1 + src/util/virxml.c | 19 +++++++++++++------ src/util/virxml.h | 3 +++ src/vmx/vmx.c | 5 ++--- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 46620d38ed..7a3374b5be 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28692,10 +28692,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef= Ptr def, * Thankfully, libxml maps what looks like globals into * thread-local uses, so we are thread-safe. */ xmlIndentTreeOutput =3D 1; - if (!(xmlbuf =3D xmlBufferCreate())) { - virReportOOMError(); - return -1; - } + xmlbuf =3D virXMLBufferCreate(); if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, virBufferGetIndent(buf) / 2, 1) < 0) { diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f32710b781..69d99a60e0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2513,10 +2513,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, * Thankfully, libxml maps what looks like globals into * thread-local uses, so we are thread-safe. */ xmlIndentTreeOutput =3D 1; - if (!(xmlbuf =3D xmlBufferCreate())) { - virReportOOMError(); - return -1; - } + xmlbuf =3D virXMLBufferCreate(); if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, virBufferGetIndent(buf) / 2, 1) < 0) { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6b7261b987..dd54550b60 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3529,6 +3529,7 @@ virVsockSetGuestCid; # util/virxml.h virParseScaledValue; +virXMLBufferCreate; virXMLCheckIllegalChars; virXMLExtractNamespaceXML; virXMLFormatElement; diff --git a/src/util/virxml.c b/src/util/virxml.c index 0354251941..3fed2b2a6e 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -941,12 +941,7 @@ char * virXMLNodeToString(xmlDocPtr doc, xmlNodePtr node) { - g_autoptr(xmlBuffer) xmlbuf =3D NULL; - - if (!(xmlbuf =3D xmlBufferCreate())) { - virReportOOMError(); - return NULL; - } + g_autoptr(xmlBuffer) xmlbuf =3D virXMLBufferCreate(); if (xmlNodeDump(xmlbuf, doc, node, 0, 1) =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1467,3 +1462,15 @@ virParseScaledValue(const char *xpath, *val =3D bytes; return 1; } + + +xmlBufferPtr +virXMLBufferCreate(void) +{ + xmlBufferPtr ret; + + if (!(ret =3D xmlBufferCreate())) + abort(); + + return ret; +} diff --git a/src/util/virxml.h b/src/util/virxml.h index e696dd25f5..24a2234506 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -286,3 +286,6 @@ int virParseScaledValue(const char *xpath, unsigned long long scale, unsigned long long max, bool required); + +xmlBufferPtr +virXMLBufferCreate(void); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index db535ba260..e6c0900a65 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -771,7 +771,7 @@ virVMXConvertToUTF8(const char *encoding, const char *s= tring) char *result =3D NULL; xmlCharEncodingHandlerPtr handler; g_autoptr(xmlBuffer) input =3D NULL; - g_autoptr(xmlBuffer) utf8 =3D NULL; + g_autoptr(xmlBuffer) utf8 =3D virXMLBufferCreate(); handler =3D xmlFindCharEncodingHandler(encoding); @@ -781,8 +781,7 @@ virVMXConvertToUTF8(const char *encoding, const char *s= tring) return NULL; } - if (!(input =3D xmlBufferCreateStatic((char *)string, strlen(string)))= || - !(utf8 =3D xmlBufferCreate())) { + if (!(input =3D xmlBufferCreateStatic((char *)string, strlen(string)))= ) { virReportOOMError(); goto cleanup; } --=20 2.29.2