From e565d934d21e3544b820cd03b88061e71ab644a0 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 10 Jun 2015 08:24:58 +0200 Subject: qapi: Fix to reject stray 't', 'f' and 'n' Screwed up in commit e53188a. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'scripts') diff --git a/scripts/qapi.py b/scripts/qapi.py index a24a7e2778..6faa897fa6 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 -- cgit v1.2.3