From nobody Mon Feb 9 09:28:55 2026 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=1636986170; cv=none; d=zohomail.com; s=zohoarc; b=Ufm8TN6qraShubktogCZ8cSKkc2ZZv439My6Q8ACs+jOxY3hU68FNUU2lRuNeDgSg5GIWADAGIn3WXgRBQDD3pOtqRCl6mj9P45BJ7ETnklFRHz97MzXXrSz00riKjt8oRHUFCCjR1wuJBu8v7kxZ8uIvr0CWi1U0X9SkCWIGQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986170; 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=SAFIifibjLHH7NJl69VCtyIpsdkH8vo0lJbQBvU6GtQ=; b=i5PtBPGGuCgCtU1F0mf1dP9ITXyCmuBGify7gA2r8G7X8Br5dhkx+OYrMnVu5B6AVpA407SKB7xnqDTpyGEu68lOk7bD8oaRAt4fprjanAD0K9uVLqcIzksojSp2vwZ17Pdt6tzsiXHoEMbLtrnpPV9CoApU+d9dz8TY5xmAaZU= 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) 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 16369861698301023.8120981027366; Mon, 15 Nov 2021 06:22:49 -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-244-Iuf3AvhROsKwdCBcZrlCaw-1; Mon, 15 Nov 2021 09:22:47 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A235106C0F1; Mon, 15 Nov 2021 14:22:41 +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 6B1D518A45; Mon, 15 Nov 2021 14:22:41 +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 3E81F1806D03; Mon, 15 Nov 2021 14:22:41 +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 1AFEMMIR009686 for ; Mon, 15 Nov 2021 09:22:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id B6FCC22719; Mon, 15 Nov 2021 14:22:22 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 220035BB06 for ; Mon, 15 Nov 2021 14:22:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986168; 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=SAFIifibjLHH7NJl69VCtyIpsdkH8vo0lJbQBvU6GtQ=; b=ixTCgjmOfvSBSNx+FeAjNoU16JhPVOfP17iBR9naxdlmDaMmvYJkX9NwTTII3mSkGh+nbq UHDJhUt/YhUvyIuGJdabXxkygbdM6Xg1gtJLtmJJbng1SH2+k0gaRecDMSEbqu0tuCzIZd +Lam6gnM78uo3YmEaT11VjKlF/VJP28= X-MC-Unique: Iuf3AvhROsKwdCBcZrlCaw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/18] virJSONValueObjectAddVArgs: Allocate new object if passed pointer is NULL Date: Mon, 15 Nov 2021 15:22:02 +0100 Message-Id: <19e667351b0ece79fada1007b7c2153b19827471.1636986086.git.pkrempa@redhat.com> 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.14 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) X-ZM-MESSAGEID: 1636986254853100001 Content-Type: text/plain; charset="utf-8" Until now the code would crash if virJSONValueObjectAdd is used without a valid object. Adding the functionality of allocating it if it's NULL will allow us to replace all uses of virJSONValueObjectCreate with this single function. Signed-off-by: Peter Krempa --- src/util/virjson.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index bd71b84960..8b3599e94f 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -155,11 +155,15 @@ int virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args) { + g_autoptr(virJSONValue) newobj =3D NULL; virJSONValue *obj =3D *objptr; char type; char *key; int rc; + if (obj =3D=3D NULL) + newobj =3D obj =3D virJSONValueNewObject(); + while ((key =3D va_arg(args, char *)) !=3D NULL) { if (strlen(key) < 3 || key[1] !=3D ':') { @@ -344,6 +348,9 @@ virJSONValueObjectAddVArgs(virJSONValue **objptr, if (virJSONValueObjectKeysNumber(obj) =3D=3D 0) return 0; + if (newobj) + *objptr =3D g_steal_pointer(&newobj); + return 1; } @@ -366,17 +373,9 @@ int virJSONValueObjectCreateVArgs(virJSONValue **obj, va_list args) { - int ret; - - *obj =3D virJSONValueNewObject(); + *obj =3D NULL; - /* free the object on error, or if no value objects were added */ - if ((ret =3D virJSONValueObjectAddVArgs(obj, args)) <=3D 0) { - virJSONValueFree(*obj); - *obj =3D NULL; - } - - return ret; + return virJSONValueObjectAddVArgs(obj, args); } --=20 2.31.1