- (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder"

argument to nanosleep may be NULL.  Currently this never happens in OpenSSH,
   but check anyway in case this changes or the code gets used elsewhere.
This commit is contained in:
Darren Tucker 2007-06-11 14:34:53 +10:00
parent 34a176995f
commit 1534fa41e0
2 changed files with 6 additions and 2 deletions

View File

@ -26,6 +26,9 @@
ciphers, since groff has trouble with wide lines; ciphers, since groff has trouble with wide lines;
- (djm) [configure.ac umac.c] If platform doesn't provide swap32(3), then - (djm) [configure.ac umac.c] If platform doesn't provide swap32(3), then
fallback to provided bit-swizzing functions fallback to provided bit-swizzing functions
- (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder"
argument to nanosleep may be NULL. Currently this never happens in OpenSSH,
but check anyway in case this changes or the code gets used elsewhere.
20070605 20070605
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -3001,4 +3004,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4685 2007/06/11 04:15:42 djm Exp $ $Id: ChangeLog,v 1.4686 2007/06/11 04:34:53 dtucker Exp $

View File

@ -158,6 +158,7 @@ int nanosleep(const struct timespec *req, struct timespec *rem)
tremain.tv_sec = 0; tremain.tv_sec = 0;
tremain.tv_usec = 0; tremain.tv_usec = 0;
} }
if (rem != NULL)
TIMEVAL_TO_TIMESPEC(&tremain, rem) TIMEVAL_TO_TIMESPEC(&tremain, rem)
return(rc); return(rc);