From nobody Mon Feb 9 00:26:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1614183501; cv=none; d=zohomail.com; s=zohoarc; b=O1n451MgzUpwtyMVr+MoTS51ie8FiF+QGsylEnW4ZcFP8oATL/pw7CXVLYvZXhkt3BR8l3LlLVCYGzIA46ETtZqeFPOL3ljeMhUh+nXg+yT2R1MZXwhKaw+7Kvim+3l3T0iElJdXKfiWnAj9VTFMZaI+dI5WwS0138yYcd+hEN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614183501; 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=rXRa+urYaT7c99vcriBXD7zrfS5L0p+q/HJVZm2fDLg=; b=Qn3I39orehpWKqTducqEijINsk+q+ivBhxlSvdoZQFPZlFePcH26yHd2491u+0ZKl79i5JPbrpuYdr97OK98ZLUAx6UgiyXz4JGlVdMmFQrZEXDZ4y5OKenX7I+mVqm9s0ikSpeF5FMTSL1ATYA74TQ2LSN54CWI3R44LKu/5nQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1614183501556534.0978292308699; Wed, 24 Feb 2021 08:18:21 -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-536-Jbj0zxGhNgao_UotFTOSVg-1; Wed, 24 Feb 2021 11:18:17 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AFFA050753; Wed, 24 Feb 2021 16:18:09 +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 84CC22C01F; Wed, 24 Feb 2021 16:18:09 +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 217AC1800420; Wed, 24 Feb 2021 16:18:09 +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 11OGI2lL015972 for ; Wed, 24 Feb 2021 11:18:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2C136646DC; Wed, 24 Feb 2021 16:18:02 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8145360D79 for ; Wed, 24 Feb 2021 16:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614183500; 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=rXRa+urYaT7c99vcriBXD7zrfS5L0p+q/HJVZm2fDLg=; b=RkNUkMfGHP1O7NElBhetk8sF4OSDCtB76M6ULLyy2eWHTeBYKFuNtYT8SZar7ZJLKKy4HA W/lXQWEgbJztzKPg7idTkeNaIQgAosP3RGOB7T8KuKKxC6L0SHQoOXGYQ/OpETl9hLUTCk QRtu4xmtEcrnHFafx8BomEzdeZfjmC0= X-MC-Unique: Jbj0zxGhNgao_UotFTOSVg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 29/33] virVBoxSnapshotConfSaveVboxFile: abort() on failure to allocate xmlDoc and comment Date: Wed, 24 Feb 2021 17:17:04 +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.79 on 10.5.11.11 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" 'xmlNewDoc' and 'xmlNewDocComment' return NULL only on allocation failure. Attempting to raise an error is pointless. Signed-off-by: Peter Krempa --- src/vbox/vbox_snapshot_conf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 5792d3175e..4f12d2ebfa 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -996,10 +996,8 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMac= hinePtr machine, goto cleanup; } xml =3D xmlNewDoc(BAD_CAST "1.0"); - if (!xml) { - virReportOOMError(); - goto cleanup; - } + if (!xml) + abort(); cur =3D virXMLNewNode(NULL, "VirtualBox"); @@ -1023,10 +1021,8 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfM= achinePtr machine, "OVERWRITTEN AND LOST.\n" "Changes to this xml configuration should be ma= de using Virtualbox\n" "or other application using the libvirt API"); - if (!cur) { - virReportOOMError(); - goto cleanup; - } + if (!cur) + abort(); if (!xmlAddPrevSibling(xmlDocGetRootElement(xml), cur)) { virReportError(VIR_ERR_XML_ERROR, "%s", --=20 2.29.2