From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4sAC-00073f-TI for qemu-devel@nongnu.org; Tue, 16 Jun 2015 10:48:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4sA9-000141-I4 for qemu-devel@nongnu.org; Tue, 16 Jun 2015 10:48:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4s2x-0005c4-WA for qemu-devel@nongnu.org; Tue, 16 Jun 2015 10:41:04 -0400 From: Markus Armbruster Date: Tue, 16 Jun 2015 16:40:50 +0200 Message-Id: <1434465658-20782-8-git-send-email-armbru@redhat.com> In-Reply-To: <1434465658-20782-1-git-send-email-armbru@redhat.com> References: <1434465658-20782-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 07/15] qapi: Fix to reject stray 't', 'f' and 'n' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com Screwed up in commit e53188a. --- scripts/qapi.py | 26 ++++++++++++-------------- 1 file 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 -- 1.9.3