summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-10-11 01:03:05 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-10-11 01:03:05 +0200
commit0b79ca725fbce37437e7b430d9d73c0d71a169e8 (patch)
tree943c6bf05784e71e740a3600a0e766ba8734b8d9
parente5cfea491fd9409916f71ad43d062c09d979ee36 (diff)
parenta4cc6bf188bf3ebb131bfd2cbb83d86280dbcc2d (diff)
Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chk
-rw-r--r--sysdeps/mach/hurd/adjtime.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/mach/hurd/adjtime.c b/sysdeps/mach/hurd/adjtime.c
index d65b95b9c6..7cfdd53e82 100644
--- a/sysdeps/mach/hurd/adjtime.c
+++ b/sysdeps/mach/hurd/adjtime.c
@@ -28,11 +28,15 @@ __adjtime (const struct timeval *delta, struct timeval *olddelta)
{
error_t err;
mach_port_t hostpriv;
+ struct timeval dummy;
err = __get_privileged_ports (&hostpriv, NULL);
if (err)
return __hurd_fail (EPERM);
+ if (olddelta == NULL)
+ olddelta = &dummy;
+
err = __host_adjust_time (hostpriv,
/* `time_value_t' and `struct timeval' are in
fact identical with the names changed. */