From nobody Sun Feb 8 14:22:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500059425726772.8256896113362; Fri, 14 Jul 2017 12:10:25 -0700 (PDT) Received: from localhost ([::1]:39546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW5yn-0004N9-9J for importer@patchew.org; Fri, 14 Jul 2017 15:10:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW5x4-0002J2-Dp for qemu-devel@nongnu.org; Fri, 14 Jul 2017 15:08:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dW5x3-00021R-AV for qemu-devel@nongnu.org; Fri, 14 Jul 2017 15:08:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dW5x3-000216-20 for qemu-devel@nongnu.org; Fri, 14 Jul 2017 15:08:33 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 21FF4356BF5; Fri, 14 Jul 2017 19:08:32 +0000 (UTC) Received: from red.redhat.com (ovpn-121-60.rdu2.redhat.com [10.10.121.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 856E65D966; Fri, 14 Jul 2017 19:08:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 21FF4356BF5 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 21FF4356BF5 From: Eric Blake To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 14:08:24 -0500 Message-Id: <20170714190827.4083-3-eblake@redhat.com> In-Reply-To: <20170714190827.4083-1-eblake@redhat.com> References: <20170714190827.4083-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 14 Jul 2017 19:08:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/5] tests: Enhance qobject output to cover partial visit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: armbru@redhat.com, Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add a test that proves (at least when run under valgrind) that we are correctly handling allocated memory even when a visit is aborted in the middle for whatever other reason. See commit f24582d "qapi: fix double free in qmp_output_visitor_cleanup()" for a fix that was lacking testsuite exposure prior to this patch. Signed-off-by: Eric Blake --- tests/test-qobject-output-visitor.c | 46 +++++++++++++++++++++++++++++++++= +++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index 749c540..1e9a5d1 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -1,7 +1,7 @@ /* * QObject Output Visitor unit-tests. * - * Copyright (C) 2011-2016 Red Hat Inc. + * Copyright (C) 2011-2017 Red Hat Inc. * * Authors: * Luiz Capitulino @@ -251,6 +251,48 @@ static void test_visitor_out_struct_errors(TestOutputV= isitorData *data, } +static void test_visitor_out_partial_visit(TestOutputVisitorData *data, + const void *unused) +{ + /* Various checks that a mid-visit abort doesn't leak or double-free. = */ + const char *str =3D "hi"; + Error *err =3D NULL; + UserDefAlternate uda =3D { + .type =3D QTYPE_QDICT, + .u.udfu =3D { .integer =3D 1, + .string =3D (char *) "bye", + .enum1 =3D -1 } /* intentionally bad */ + }; + UserDefAlternate *obj =3D &uda; + + /* Abort within a nested object with no data members */ + visit_start_struct(data->ov, NULL, NULL, 0, &error_abort); + visit_start_struct(data->ov, "nested", NULL, 0, &error_abort); + visitor_reset(data); + + /* Abort in the middle of a list of strings */ + visit_start_list(data->ov, "list", NULL, 0, &error_abort); + visit_type_str(data->ov, NULL, (char **)&str, &error_abort); + visit_type_str(data->ov, NULL, (char **)&str, &error_abort); + visitor_reset(data); + + /* + * Abort in the middle of an alternate. Alternates can't be + * virtually visited, so we get to inline the first half of + * visit_type_UserDefAlternate(). + */ + visit_start_alternate(data->ov, NULL, (GenericAlternate **)&obj, + sizeof(uda), &error_abort); + visit_start_struct(data->ov, NULL, NULL, 0, &error_abort); + visit_type_UserDefUnionBase_members(data->ov, + (UserDefUnionBase *)&uda.u.udfu, + &err); + /* error expected because of bad "enum1" discriminator value */ + error_free_or_abort(&err); + visitor_reset(data); +} + + static void test_visitor_out_list(TestOutputVisitorData *data, const void *unused) { @@ -815,6 +857,8 @@ int main(int argc, char **argv) &out_visitor_data, test_visitor_out_struct_nes= ted); output_visitor_test_add("/visitor/output/struct-errors", &out_visitor_data, test_visitor_out_struct_err= ors); + output_visitor_test_add("/visitor/output/partial-visit", + &out_visitor_data, test_visitor_out_partial_vi= sit); output_visitor_test_add("/visitor/output/list", &out_visitor_data, test_visitor_out_list); output_visitor_test_add("/visitor/output/any", --=20 2.9.4