From patchwork Mon Jul 23 11:50:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 172635 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 72E102C0347 for ; Mon, 23 Jul 2012 21:51:14 +1000 (EST) Received: from localhost ([::1]:53779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StHAO-0005Jx-I4 for incoming@patchwork.ozlabs.org; Mon, 23 Jul 2012 07:51:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StHAF-0005Ja-I3 for qemu-devel@nongnu.org; Mon, 23 Jul 2012 07:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StHAA-0000Tu-8M for qemu-devel@nongnu.org; Mon, 23 Jul 2012 07:51:03 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:35068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StHA9-0000TM-Vw for qemu-devel@nongnu.org; Mon, 23 Jul 2012 07:50:58 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 23 Jul 2012 12:50:56 +0100 Received: from d06nrmr1507.portsmouth.uk.ibm.com (9.149.38.233) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 23 Jul 2012 12:50:54 +0100 Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6NBorTv2613456 for ; Mon, 23 Jul 2012 12:50:53 +0100 Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6NBorta011502 for ; Mon, 23 Jul 2012 05:50:53 -0600 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6NBorA8011491; Mon, 23 Jul 2012 05:50:53 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Mon, 23 Jul 2012 12:50:28 +0100 Message-Id: <1343044244-28728-4-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343044244-28728-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1343044244-28728-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072311-3548-0000-0000-0000029FFC16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.112 Cc: Laszlo Ersek , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 03/19] 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 From: Laszlo Ersek v3: - new patch Signed-off-by: Laszlo Ersek Signed-off-by: Stefan Hajnoczi --- tests/test-qmp-commands.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) 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();