From nobody Thu Nov 6 05:46:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585854728; cv=none; d=zohomail.com; s=zohoarc; b=hh6uhPj0g5DRL+uj+gmYTOfO6G4gWKCxUMOPFnAu2xjhVlEB1AOG+/2PNdmZXuWMuSmbBuWZFCRITH8jMNTRtAr9PHOt6QZ/fD76MZp6WtgfsDpD6lyjGRqm1v+/QYeNIGoP4ZLNNjlDv2ybEfVAV1HXYm5PXHd5H3QHuDH4hl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585854728; 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=cgUCuiQImsO71G7idTK9arqrOSPOAEA79IR0k9B/Lbo=; b=LVkzZWrkb0+4uWES6VhbzevDHOowAqTCHpkoKUnkDDpOceM17YOZkIfCnuQv+wWHFcar3bEeCtOM9B/rekMn4vZP3PwtLFhxigEH7WlDC8XVEOI+z7y+8Cz1d5NcXPFMEaBNa1zUi/pw6YruB/j9qC4OpYoGhXepobxpziJcG4E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585854728917216.33851677273378; Thu, 2 Apr 2020 12:12:08 -0700 (PDT) Received: from localhost ([::1]:46380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jK5G3-0002od-N9 for importer@patchew.org; Thu, 02 Apr 2020 15:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33922) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jK5B3-0002Xh-7A for qemu-devel@nongnu.org; Thu, 02 Apr 2020 15:06:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jK5B2-0000Su-3R for qemu-devel@nongnu.org; Thu, 02 Apr 2020 15:06:57 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22021 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jK5B1-0000S9-Vz for qemu-devel@nongnu.org; Thu, 02 Apr 2020 15:06:56 -0400 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-27-8jS2BQlkMKyzO7HfZlNJXg-1; Thu, 02 Apr 2020 15:06:53 -0400 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 71628108442D for ; Thu, 2 Apr 2020 19:06:52 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D53750BEE for ; Thu, 2 Apr 2020 19:06:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585854415; h=from:from: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; bh=cgUCuiQImsO71G7idTK9arqrOSPOAEA79IR0k9B/Lbo=; b=X8ibEDN0T9BUfGnvIzruq8ImgjviqE3CETv5YuMI3+auHMf/Ex7+3Hp8wxs2MJFRmNsr+/ nPyMxYdrdXJ1vKvOJhH2VehCXfkhPej2LIvfnTWDCHKpGEsygrN+m5EBr85SDnaAWN01od qHBesv46NDdmPk6/Bd7Y1Oq2IOvb7Ew= X-MC-Unique: 8jS2BQlkMKyzO7HfZlNJXg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/15] object-add: don't create return value if failed Date: Thu, 2 Apr 2020 15:06:39 -0400 Message-Id: <20200402190640.1693-15-pbonzini@redhat.com> In-Reply-To: <20200402190640.1693-1-pbonzini@redhat.com> References: <20200402190640.1693-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" No need to return an empty value from object-add (it would also leak if the command failed). While at it, remove the "if" around object_unref since object_unref handles NULL arguments just fine. Reported-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200325184723.2029630-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- qom/qom-qmp-cmds.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 435193b036..e47ebe8ed1 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -285,10 +285,7 @@ void qmp_object_add(QDict *qdict, QObject **ret_data, = Error **errp) v =3D qobject_input_visitor_new(QOBJECT(qdict)); obj =3D user_creatable_add_type(type, id, qdict, v, errp); visit_free(v); - if (obj) { - object_unref(obj); - } - *ret_data =3D QOBJECT(qdict_new()); + object_unref(obj); } =20 void qmp_object_del(const char *id, Error **errp) --=20 2.18.2