From nobody Mon Feb 9 10:30:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1638543676; cv=none; d=zohomail.com; s=zohoarc; b=a+JLLSnkmDW9lvV1KJXkgP4ujdFqCksK8mIYDQnCflYqRq1m7IreMdh+5kO/AJxfocsrqFfor9N30VtHZp7uCdjh7QuL3q1WyTO5o++ajf0YFesCkcwstXgJZxftgoDd1GP2LyWBrURPs10g/jGl9xKUJoyR/1YEuVczHz8WKe0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638543676; 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=4FgWIaYmv3CzEtgOXX2688gDh4x+KC1iS4ODTB6S44k=; b=l2RFTCsUxXelfceArD6R3qt026NqneACO3wyywNA/hDUgZlkJgJUbzHLkGefeJ9KGMBfwS8mRc7cTytmqpqCAO9HPPzXKcDGKC+TVGPeJVw9wKfCFxBwuUS7W0LYpYgLbV7IE4I/6kWplxEE9z/I+II6HtZPsHGoQBjzywF/0FE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1638543676386104.5316182318968; Fri, 3 Dec 2021 07:01:16 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-259-av1QMVouMRqyKBJtsBNiCA-1; Fri, 03 Dec 2021 10:01:12 -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 9C6A4100CCE2; Fri, 3 Dec 2021 15:01:02 +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 2C89C5DF21; Fri, 3 Dec 2021 15:01:02 +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 C77271802E2A; Fri, 3 Dec 2021 15:01:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B3Evxri029676 for ; Fri, 3 Dec 2021 09:57:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8DE3F10016F5; Fri, 3 Dec 2021 14:57:59 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id F00B810016F4 for ; Fri, 3 Dec 2021 14:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638543675; 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=4FgWIaYmv3CzEtgOXX2688gDh4x+KC1iS4ODTB6S44k=; b=iD0dKRwHDutcEXU5DxomDqdjPiiqbjxszsfTenynb7BDrtEpciXIxPhHYq58Bay5T3bmOV fRfxIUXeKVeWFyMgue5e4BvMWPKIPbKQ26FcSCANx2CIGrVLqKSp1JBE6KmDUaCQrDfAjm KAWk+iH4wmSAjMdsKjAVBTUoEm/yD20= X-MC-Unique: av1QMVouMRqyKBJtsBNiCA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/16] qemuMonitorAddObject: Use g_clear_pointer for a free and reset operation Date: Fri, 3 Dec 2021 15:57:40 +0100 Message-Id: <6900b6712c7ae30c6edebfb6b73e7d7e9e0df730.1638543041.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: 1638543678966100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d752b299ab..6beb23e9f7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2956,10 +2956,9 @@ qemuMonitorAddObject(qemuMonitor *mon, ignore_value(virJSONValueObjectRemoveKey(*props, "qom-type", &type= obj)); ignore_value(virJSONValueObjectRemoveKey(*props, "id", &idobj)); - if (!virJSONValueObjectGetKey(*props, 0)) { - virJSONValueFree(*props); - *props =3D NULL; - } + /* avoid empty 'props' member */ + if (!virJSONValueObjectGetKey(*props, 0)) + g_clear_pointer(props, virJSONValueFree); if (virJSONValueObjectAdd(&pr, "s:qom-type", type, --=20 2.31.1