summaryrefslogtreecommitdiff
path: root/scripts/Expect.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-08-21 19:20:06 +0200
committerJose <jose@zeroc.com>2013-08-21 19:20:06 +0200
commit3ed5b0cac70729c47b136403a85b3eeb0a28b564 (patch)
tree0f67024747be90c34c6bffa1777ef63b76054ee6 /scripts/Expect.py
parentregenerating FreezeScript/Grammar.cpp (diff)
downloadice-3ed5b0cac70729c47b136403a85b3eeb0a28b564.tar.bz2
ice-3ed5b0cac70729c47b136403a85b3eeb0a28b564.tar.xz
ice-3ed5b0cac70729c47b136403a85b3eeb0a28b564.zip
Fixed (ICE-5403) - error in regular expression engine
Diffstat (limited to 'scripts/Expect.py')
-rwxr-xr-xscripts/Expect.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py
index 8701f6b8683..45edb751acc 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -197,6 +197,11 @@ class reader(threading.Thread):
s, regexp = p
if s == TIMEOUT:
continue
+ if not buf:
+ #
+ # Don't try to match on an empty buffer, http://bugs.python.org/issue17998
+ #
+ break
m = regexp.search(buf)
if m is not None:
before = buf[:m.start()]