From patchwork Wed Mar 25 18:47:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1261605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KIEnuBo0; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ncnQ5yHLz9sQt for ; Thu, 26 Mar 2020 05:57:46 +1100 (AEDT) Received: from localhost ([::1]:41522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHB5j-0002qe-Ji for incoming@patchwork.ozlabs.org; Wed, 25 Mar 2020 14:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48575) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHB47-00026z-4T for qemu-devel@nongnu.org; Wed, 25 Mar 2020 14:47:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHB46-0003gq-7A for qemu-devel@nongnu.org; Wed, 25 Mar 2020 14:47:47 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:60749) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHB45-0003g5-AF for qemu-devel@nongnu.org; Wed, 25 Mar 2020 14:47:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585162064; h=from:from: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; bh=qnv3awp4VN8xXiCk1fwWSqRez1nXNOKyCpBaU0jBJ4c=; b=KIEnuBo0stzaaOkzA44Fh75So3Cayk0l4K/VFdkBKacX90P09t3gLf8uKBUO79NtNEEAI/ CtuYBXtzC2VfbXK6BtUqfI8Pwe1Q8i+V24gJIerVc//NWo2/QVbUIUZrZJutLXIXo2M70G oWOrBDnFO6FFDoH21Gz/mCc/lI+Ng0M= 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-480-i5qjA_jkNumXA4kHX-4fOg-1; Wed, 25 Mar 2020 14:47:40 -0400 X-MC-Unique: i5qjA_jkNumXA4kHX-4fOg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E0081005509; Wed, 25 Mar 2020 18:47:39 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE7BB60BF3; Wed, 25 Mar 2020 18:47:38 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH for-5.0 3/3] object-add: don't create return value if failed Date: Wed, 25 Mar 2020 19:47:23 +0100 Message-Id: <20200325184723.2029630-4-marcandre.lureau@redhat.com> In-Reply-To: <20200325184723.2029630-1-marcandre.lureau@redhat.com> References: <20200325184723.2029630-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , Michael Roth , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lure?= =?utf-8?q?au?= , Paolo Bonzini , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If object-add failed, no need to create a return value that may later be leaked. Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Reported-by: Marc-André Lureau Signed-off-by: Paolo Bonzini Reviewed-by: Markus Armbruster --- qom/qom-qmp-cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 435193b036..6bd137ccbf 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -287,8 +287,8 @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp) visit_free(v); if (obj) { object_unref(obj); + *ret_data = QOBJECT(qdict_new()); } - *ret_data = QOBJECT(qdict_new()); } void qmp_object_del(const char *id, Error **errp)