From nobody Thu Apr 25 05:35:33 2024 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=1619192397; cv=none; d=zohomail.com; s=zohoarc; b=joc0WQiQkxIQCgizt+7ucFJpJyG28o9cC4WaGr1dYn26U/vj9xM+03UOf3ZemHgaZCddQBbL2cz9qznMWjGshz9CT5XEPuTkWoICgCXplgEPaqs+L3xnGf/0nVYCdRnSglrvoxbGt6fM4M43i5hXyjt5Wp8Y8iJ62Wik0G93LpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619192397; h=Content-Type:Content-Transfer-Encoding:Cc: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=0qxmvVx/hyGKtV8+pwkqlbO+JG0RjVy/TkHriVtQTuA=; b=YuUIMoqj5rYDlqZKFopq2peLtu164OR5krP6n6BZdUHXAu6Ggizw4nMCSNjP5u/PeQyvrJAVT1FtpzJQc/0hghf91VktfZ0NaTZpHgdT/dtpod85BrqrIXO+EFWficolZyarOFhoiYHLy99INf6bkxD0/jfw/q+pgEGgXcGJn2I= 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 1619192397846943.8481677375576; Fri, 23 Apr 2021 08:39:57 -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-473-F1ORDE-QP-evWTx7DCwTuw-1; Fri, 23 Apr 2021 11:39:54 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EF698026AD; Fri, 23 Apr 2021 15:39:47 +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 6845C19714; Fri, 23 Apr 2021 15:39:47 +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 37CD21806D21; Fri, 23 Apr 2021 15:39:47 +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 13NFdeXd004282 for ; Fri, 23 Apr 2021 11:39:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6BABE60C5A; Fri, 23 Apr 2021 15:39:40 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A71C560854; Fri, 23 Apr 2021 15:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619192396; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=0qxmvVx/hyGKtV8+pwkqlbO+JG0RjVy/TkHriVtQTuA=; b=fgG2jHLlsOknef9Ld7Hh0R3rX4AQtfXo7xAPg7iLXldWG0W87PeJLWseIj6fZEkDQpU0lR 9E3dDi3rtBvoHKNCO2bwW4qd7Rnsdm6pPAKzTLqeSpJDoU9GdXwUHIkpClGbYtJ5tBunyX nhKmOXWa1y+arQYTVArQSiJHUb82ATE= X-MC-Unique: F1ORDE-QP-evWTx7DCwTuw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] virDomainAudioSDLParse: Use virXMLProp* Date: Fri, 23 Apr 2021 17:39:23 +0200 Message-Id: <20210423153923.339223-11-twiederh@redhat.com> In-Reply-To: <20210423153923.339223-1-twiederh@redhat.com> References: <20210423153923.339223-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.23 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" This strictens the parser to disallow negative values (interpreted as `UINT_MAX + value + 1`) for attribute `bufferCount`. Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bff17057af..12bdc12f54 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13455,15 +13455,9 @@ static int virDomainAudioSDLParse(virDomainAudioIOSDL *def, xmlNodePtr node) { - g_autofree char *bufferCount =3D virXMLPropString(node, "bufferCount"); - - if (bufferCount && - virStrToLong_ui(bufferCount, NULL, 10, - &def->bufferCount) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("cannot parse 'bufferCount' value '%s'"), bufferC= ount); + if (virXMLPropUInt(node, "bufferCount", 10, VIR_XML_PROP_NONE, + &def->bufferCount) < 0) return -1; - } =20 return 0; } --=20 2.26.3