aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-06-10 08:24:58 +0200
committerMarkus Armbruster <armbru@redhat.com>2015-06-18 14:19:34 +0200
commite565d934d21e3544b820cd03b88061e71ab644a0 (patch)
tree236766400e35fc2031a6b0932f10d378878da354 /scripts
parenta1366087270b312d94ff8c4031395a4218f160d4 (diff)
downloadqemu-e565d934d21e3544b820cd03b88061e71ab644a0.zip
qemu-e565d934d21e3544b820cd03b88061e71ab644a0.tar.gz
qemu-e565d934d21e3544b820cd03b88061e71ab644a0.tar.bz2
qapi: Fix to reject stray 't', 'f' and 'n'
Screwed up in commit e53188a. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi.py26
1 files changed, 12 insertions, 14 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py
index a24a7e2..6faa897 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -217,20 +217,18 @@ class QAPISchema:
return
else:
string += ch
- elif self.tok in "tfn":
- val = self.src[self.cursor - 1:]
- if val.startswith("true"):
- self.val = True
- self.cursor += 3
- return
- elif val.startswith("false"):
- self.val = False
- self.cursor += 4
- return
- elif val.startswith("null"):
- self.val = None
- self.cursor += 3
- return
+ elif self.src.startswith("true", self.pos):
+ self.val = True
+ self.cursor += 3
+ return
+ elif self.src.startswith("false", self.pos):
+ self.val = False
+ self.cursor += 4
+ return
+ elif self.src.startswith("null", self.pos):
+ self.val = None
+ self.cursor += 3
+ return
elif self.tok == '\n':
if self.cursor == len(self.src):
self.tok = None