summaryrefslogtreecommitdiff
path: root/compat/poll
diff options
context:
space:
mode:
authorLibravatar Joachim Schmitz <jojo@schmitz-digital.de>2012-09-17 23:23:17 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-17 15:43:44 -0700
commit32fde6575e4139710ea5259ee9b7c750b7c2dde0 (patch)
tree31b6aa8517aa42c238ca1988acf2d051acd6a765 /compat/poll
parentfix some win32 specific dependencies in poll.c (diff)
downloadtgif-32fde6575e4139710ea5259ee9b7c750b7c2dde0.tar.xz
poll() exits too early with EFAULT if 1st arg is NULL
If poll() is used as a milli-second sleep, like in help.c, by passing a NULL in the 1st and a 0 in the 2nd arg, it exits with EFAULT. As per Paolo Bonzini, the original author, this is a bug and to be fixed Like in this commit, which is not to exit if the 2nd arg is 0. It got fixed In gnulib in the same manner the other day. Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/poll')
-rw-r--r--compat/poll/poll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 49541f19cd..e4b8319fb7 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -353,7 +353,7 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
/* EFAULT is not necessary to implement, but let's do it in the
simplest case. */
- if (!pfd)
+ if (!pfd && nfd)
{
errno = EFAULT;
return -1;