aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-11-14 18:52:09 +0100
committerJuanma Barranquero2011-11-14 18:52:09 +0100
commitf067b8eccaa2990b157f2a97a1122211ae751156 (patch)
tree6c0a316459bbe0dde47788088a55d1dc665cbfc5 /src
parenta9a75fac5ecc6591a79c83caa02033b6bc58ce3f (diff)
downloademacs-f067b8eccaa2990b157f2a97a1122211ae751156.tar.gz
emacs-f067b8eccaa2990b157f2a97a1122211ae751156.zip
Fix bug#10044
src/w32proc.c (reader_thread): Don't check pending input if cp->fd < 0, just return.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32proc.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f4250ec83b0..3e2ebaa0efc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-11-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * w32proc.c (reader_thread): Don't check pending input if cp->fd < 0,
4 just return (bug#10044).
5
12011-11-12 Eli Zaretskii <eliz@gnu.org> 62011-11-12 Eli Zaretskii <eliz@gnu.org>
2 7
3 * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs 8 * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
diff --git a/src/w32proc.c b/src/w32proc.c
index 47cbf57d9ea..65d63597fae 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -241,7 +241,8 @@ reader_thread (void *arg)
241 241
242 /* We have to wait for the go-ahead before we can start */ 242 /* We have to wait for the go-ahead before we can start */
243 if (cp == NULL 243 if (cp == NULL
244 || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0) 244 || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0
245 || cp->fd < 0)
245 return 1; 246 return 1;
246 247
247 for (;;) 248 for (;;)
@@ -2319,4 +2320,3 @@ where the performance impact may be noticeable even on modern hardware. */);
2319 staticpro (&Vw32_valid_codepages); 2320 staticpro (&Vw32_valid_codepages);
2320} 2321}
2321/* end of w32proc.c */ 2322/* end of w32proc.c */
2322