From fa72f1ac084c6b655fa1107c24b6f3a62b85ecea Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Fri, 5 Jun 2015 01:45:40 +0200 Subject: Fix hang when tokenizing some invalid expressions. c.eval("&") would cause a hang before for example. --- kconfiglib.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kconfiglib.py b/kconfiglib.py index f828369..ab44eac 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -736,10 +736,7 @@ class Config(object): i = end + 1 elif c == "&": - if i + 1 >= strlen: - # Invalid characters are ignored - continue - if s[i + 1] != "&": + if i + 1 >= strlen or s[i + 1] != "&": # Invalid characters are ignored i += 1 continue @@ -747,10 +744,7 @@ class Config(object): i += 2 elif c == "|": - if i + 1 >= strlen: - # Invalid characters are ignored - continue - if s[i + 1] != "|": + if i + 1 >= strlen or s[i + 1] != "|": # Invalid characters are ignored i += 1 continue -- cgit v1.2.3