From patchwork Fri Jul 26 12:39:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 262145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3A2FB2C00ED for ; Fri, 26 Jul 2013 22:42:18 +1000 (EST) Received: from localhost ([::1]:38462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2hLc-0000TW-JF for incoming@patchwork.ozlabs.org; Fri, 26 Jul 2013 08:42:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2hJM-0005lg-8I for qemu-devel@nongnu.org; Fri, 26 Jul 2013 08:39:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2hJI-0002La-Vi for qemu-devel@nongnu.org; Fri, 26 Jul 2013 08:39:56 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:56856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2hJI-0002KV-Pn for qemu-devel@nongnu.org; Fri, 26 Jul 2013 08:39:52 -0400 Received: from blackfin.pond.sub.org (p5B32A9AB.dip0.t-ipconnect.de [91.50.169.171]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 226C5A5C6B; Fri, 26 Jul 2013 14:39:52 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0B92F200BB; Fri, 26 Jul 2013 14:39:48 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2013 14:39:43 +0200 Message-Id: <1374842387-17146-6-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1374842387-17146-1-git-send-email-armbru@redhat.com> References: <1374842387-17146-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: aliguori@us.ibm.com, akong@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 5/9] qapi.py: Reject invalid characters in schema file 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 Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi.py | 2 ++ tests/qapi-schema/funny-char.err | 1 + tests/qapi-schema/funny-char.exit | 2 +- tests/qapi-schema/funny-char.out | 3 --- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 35ff76e..f72a0e3 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -86,6 +86,8 @@ class QAPISchema: if self.cursor == len(self.src): self.tok = None return + elif not self.tok.isspace(): + raise QAPISchemaError(self, 'Stray "%s"' % self.tok) def get_members(self): expr = OrderedDict() diff --git a/tests/qapi-schema/funny-char.err b/tests/qapi-schema/funny-char.err index e69de29..d3dd293 100644 --- a/tests/qapi-schema/funny-char.err +++ b/tests/qapi-schema/funny-char.err @@ -0,0 +1 @@ +:2:36: Stray ";" diff --git a/tests/qapi-schema/funny-char.exit b/tests/qapi-schema/funny-char.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/funny-char.exit +++ b/tests/qapi-schema/funny-char.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/funny-char.out b/tests/qapi-schema/funny-char.out index e3bd904..e69de29 100644 --- a/tests/qapi-schema/funny-char.out +++ b/tests/qapi-schema/funny-char.out @@ -1,3 +0,0 @@ -[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])] -['Status'] -[]