blob: cb11235788d2f8768e9707b011ef78abf43ecef5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From: pedro martelletto <pedro@ambientworks.net>
Date: Sun, 20 Sep 2020 22:56:30 +0100
Subject: add two casts to silence warnings on 32-bit
add two casts to silence 'comparison is always false' warnings on
32-bit platforms (gcc: -Werror=type-limits, clang:
-Wtautological-constant-out-of-range-compare); gh#210
Origin: upstream, https://github.com/Yubico/libfido2/commit/7a17a4e9127fb6df6278f19396760e7d60a5862c
Bug: https://github.com/Yubico/libfido2/issues/210
Last-Update: 2020-09-20
---
src/hid_linux.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hid_linux.c b/src/hid_linux.c
index 9788012..c554784 100644
--- a/src/hid_linux.c
+++ b/src/hid_linux.c
@@ -385,8 +385,8 @@ timespec_to_ms(const struct timespec *ts, int upper_bound)
int64_t x;
int64_t y;
- if (ts->tv_sec < 0 || ts->tv_sec > INT64_MAX / 1000LL ||
- ts->tv_nsec < 0 || ts->tv_nsec / 1000000LL > INT64_MAX)
+ if (ts->tv_sec < 0 || (uint64_t)ts->tv_sec > INT64_MAX / 1000LL ||
+ ts->tv_nsec < 0 || (uint64_t)ts->tv_nsec / 1000000LL > INT64_MAX)
return (upper_bound);
x = ts->tv_sec * 1000LL;
|
