qapi.py: Reject invalid characters in schema file

Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 1374939721-7876-6-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-07-27 17:41:57 +02:00 · 2013-07-27 17:41:57 +02:00 · 9213aa5391
commit 9213aa5391
parent 2caba36cc6
7 changed files with 6 additions and 8 deletions
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@ -101,6 +101,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()
--- a/tests/qapi-schema/comments.err
+++ b/tests/qapi-schema/comments.err
@ -0,0 +1 @@
+<stdin>:2:33: Stray "#"
--- a/tests/qapi-schema/comments.exit
+++ b/tests/qapi-schema/comments.exit
@ -1 +1 @@
-0
+1
--- a/tests/qapi-schema/comments.out
+++ b/tests/qapi-schema/comments.out
@ -1,3 +0,0 @@
-[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
-['Status']
-[]
--- a/tests/qapi-schema/funny-char.err
+++ b/tests/qapi-schema/funny-char.err
@ -0,0 +1 @@
+<stdin>:2:36: Stray ";"
--- a/tests/qapi-schema/funny-char.exit
+++ b/tests/qapi-schema/funny-char.exit
@ -1 +1 @@
-0
+1
--- 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']
-[]