From patchwork Tue Jul 17 14:17:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 171438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 549172C007A for ; Wed, 18 Jul 2012 00:16:34 +1000 (EST) Received: from localhost ([::1]:35511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sr8Zk-0003QH-4u for incoming@patchwork.ozlabs.org; Tue, 17 Jul 2012 10:16:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sr8ZX-0003Q2-5p for qemu-devel@nongnu.org; Tue, 17 Jul 2012 10:16:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sr8ZS-000859-Qf for qemu-devel@nongnu.org; Tue, 17 Jul 2012 10:16:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sr8ZS-00083t-B3 for qemu-devel@nongnu.org; Tue, 17 Jul 2012 10:16:14 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6HEGD95031853 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Jul 2012 10:16:13 -0400 Received: from lacos-laptop.usersys.redhat.com (vpn1-5-251.ams2.redhat.com [10.36.5.251]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6HEG9KA022379; Tue, 17 Jul 2012 10:16:12 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org, lersek@redhat.com Date: Tue, 17 Jul 2012 16:17:05 +0200 Message-Id: <1342534641-22450-3-git-send-email-lersek@redhat.com> In-Reply-To: <1342534641-22450-1-git-send-email-lersek@redhat.com> References: <1342534641-22450-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 02/18] qapi: add test case for deallocating traversal of incomplete structure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org v3: - new patch Signed-off-by: Laszlo Ersek --- tests/test-qmp-commands.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 60cbf01..dc3c507 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -3,6 +3,9 @@ #include "test-qmp-commands.h" #include "qapi/qmp-core.h" #include "module.h" +#include "qapi/qmp-input-visitor.h" +#include "tests/test-qapi-types.h" +#include "tests/test-qapi-visit.h" void qmp_user_def_cmd(Error **errp) { @@ -123,6 +126,44 @@ static void test_dealloc_types(void) qapi_free_UserDefOneList(ud1list); } +/* test generated deallocation on an object whose construction was prematurely + * terminated due to an error */ +static void test_dealloc_partial(void) +{ + static const char text[] = "don't leak me"; + + UserDefTwo *ud2 = NULL; + Error *err = NULL; + + /* create partial object */ + { + QDict *ud2_dict; + QmpInputVisitor *qiv; + + ud2_dict = qdict_new(); + qdict_put_obj(ud2_dict, "string", QOBJECT(qstring_from_str(text))); + + qiv = qmp_input_visitor_new(QOBJECT(ud2_dict)); + visit_type_UserDefTwo(qmp_input_get_visitor(qiv), &ud2, NULL, &err); + qmp_input_visitor_cleanup(qiv); + QDECREF(ud2_dict); + } + + /* verify partial success */ + assert(ud2 != NULL); + assert(ud2->string != NULL); + assert(strcmp(ud2->string, text) == 0); + assert(ud2->dict.dict.userdef == NULL); + + /* confirm & release construction error */ + assert(err != NULL); + error_free(err); + + /* tear down partial object */ + qapi_free_UserDefTwo(ud2); +} + + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); @@ -131,6 +172,7 @@ int main(int argc, char **argv) g_test_add_func("/0.15/dispatch_cmd_error", test_dispatch_cmd_error); g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io); g_test_add_func("/0.15/dealloc_types", test_dealloc_types); + g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial); module_call_init(MODULE_INIT_QAPI); g_test_run();