summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/builtin.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa8c98257..c0de1ae7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-26  Peter Stephenson  <pws@csr.com>
+
+	* 18392: Src/builtin.c: read with -p and -t options crashed
+	if no coprocess owing to bad file descriptor.
+
 2003-03-26  Oliver Kiddle  <opk@zsh.org>
 
 	* 18391: Test/.distfiles, Test/B03print.ztst, Test/B04read.ztst,
diff --git a/Src/builtin.c b/Src/builtin.c
index 3c07ee59a..4750e8d8b 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -4212,7 +4212,8 @@ bin_read(char *name, char **args, Options ops, int func)
 		timeout = (zlong)mn.u.l * (zlong)1000000;
 	    }
 	}
-	if (!read_poll(readfd, &readchar, keys && !zleactive, timeout)) {
+	if (readfd == -1 ||
+	    !read_poll(readfd, &readchar, keys && !zleactive, timeout)) {
 	    if (OPT_ISSET(ops,'k') && !zleactive && !isem)
 		settyinfo(&shttyinfo);
 	    if (haso) {