summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-10-11 01:03:06 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-10-11 01:03:06 +0200
commitbd2ef69146cd1b0cbea6a4b4f15e914b04180085 (patch)
tree5aa1fd630caceddedeeb65736b24e70cf473e210 /sysdeps
parente25a1b64dcd62f41dfe125b722b768dfec44fb70 (diff)
parent0b79ca725fbce37437e7b430d9d73c0d71a169e8 (diff)
Merge branch 't/____longjmp_chk' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps')
-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. */