diff options
| author | Lukasz Majewski <lukma@denx.de> | 2019-10-24 16:20:56 +0200 |
|---|---|---|
| committer | Lukasz Majewski <lukma@denx.de> | 2019-10-27 21:49:25 +0100 |
| commit | 48123656609fea92a154f08ab619ab5186276432 (patch) | |
| tree | 34c399889dbe5271b30b7c840f9fd048875e704f /time | |
| parent | 513aaa0d782f8fae36732d06ca59d658149f0139 (diff) | |
| download | glibc-48123656609fea92a154f08ab619ab5186276432.zip glibc-48123656609fea92a154f08ab619ab5186276432.tar.gz glibc-48123656609fea92a154f08ab619ab5186276432.tar.bz2 | |
time: Introduce function to check correctness of nanoseconds value
The valid_nanoseconds () static inline function has been introduced to
check if nanoseconds value is in the correct range - greater or equal to
zero and less than 1000000000.
The explicit #include <time.h> has been added to files where it was
missing.
The __syscall_slong_t type for ns has been used to avoid issues on x32.
Tested with:
- scripts/build-many-glibcs.py
- make PARALLELMFLAGS="-j12" && make PARALLELMFLAGS="-j12" xcheck on x86_64
Diffstat (limited to 'time')
| -rw-r--r-- | time/clock_nanosleep.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/time/clock_nanosleep.c b/time/clock_nanosleep.c index f3230c4..5952d29 100644 --- a/time/clock_nanosleep.c +++ b/time/clock_nanosleep.c @@ -24,8 +24,7 @@ int __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, struct timespec *rem) { - if (__builtin_expect (req->tv_nsec, 0) < 0 - || __builtin_expect (req->tv_nsec, 0) >= 1000000000) + if (! valid_nanoseconds (req->tv_nsec)) return EINVAL; if (flags != TIMER_ABSTIME && flags != 0) |