summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler.cc4
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index de3429bbe..9e9422e9a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 9 23:53:00 2000 Corinna Vinschen <corinna@vinschen.de>
+
+ * fhandler.cc (fhandler_base::puts_readahead): Change
+ while condition to disallow wild runs.
+
Thu May 9 15:24:00 2000 Corinna Vinschen <corinna@vinschen.de>
Patch suggested by <lha@stacken.kth.se>
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index a5a6e91a9..ea868a839 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -22,8 +22,8 @@ int
fhandler_base::puts_readahead (const char *s, size_t len = (size_t) -1)
{
int success = 1;
- while ((((len == (size_t) -1) && *s) || len--) &&
- (success = put_readahead (*s++) > 0))
+ while ((*s || (len != (size_t) -1 && len--))
+ && (success = put_readahead (*s++) > 0))
continue;
return success;
}