From ac40930383daac77cb44bd75b2a899fa2934a81e Mon Sep 17 00:00:00 2001 From: Allan Saddi Date: Mon, 10 Sep 2007 15:56:44 -0700 Subject: Fix readline implementations so size argument is checked earlier. (transplanted from f1cc536d3f42ce695e4401ad729eec1985803579) --- ChangeLog | 5 +++++ flup/server/ajp_base.py | 6 +++--- flup/server/fcgi_base.py | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd09c95..e37b3e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-10 Allan Saddi + + * Fix readline implementations so size argument is checked + earlier. + 2007-07-14 Allan Saddi * Prevent ThreadPool inconsistences if an exception is diff --git a/flup/server/ajp_base.py b/flup/server/ajp_base.py index 74dddde..b9dfa0f 100644 --- a/flup/server/ajp_base.py +++ b/flup/server/ajp_base.py @@ -398,15 +398,15 @@ class InputStream(object): newPos = self._avail break else: + if length is not None and len(self._buf) >= length + self._pos: + newPos = self._pos + length + break # Wait for more to come. self._waitForData() continue else: newPos = i + 1 break - if length is not None: - if self._pos + length < newPos: - newPos = self._pos + length r = self._buf[self._pos:newPos] self._pos = newPos self._shrinkBuffer() diff --git a/flup/server/fcgi_base.py b/flup/server/fcgi_base.py index 42ab282..2c68484 100644 --- a/flup/server/fcgi_base.py +++ b/flup/server/fcgi_base.py @@ -189,15 +189,15 @@ class InputStream(object): newPos = self._avail break else: + if length is not None and len(self._buf) >= length + self._pos: + newPos = self._pos + length + break # Wait for more to come. self._waitForData() continue else: newPos = i + 1 break - if length is not None: - if self._pos + length < newPos: - newPos = self._pos + length r = self._buf[self._pos:newPos] self._pos = newPos self._shrinkBuffer() -- cgit v1.2.1