summaryrefslogtreecommitdiff
path: root/debian/patches/32-bit-casts.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-09-20 22:58:16 +0100
committerColin Watson <cjwatson@debian.org>2020-09-20 22:58:16 +0100
commit355784ac86d0144b641b7da34bc8ba9b08baa791 (patch)
treee01a28440e10d6890632fd6a271b6498ec0c4ef6 /debian/patches/32-bit-casts.patch
parentd7c8778db26df3d1306e6e3ca98c6be920697a72 (diff)
Fix 32-bit build errors
Diffstat (limited to 'debian/patches/32-bit-casts.patch')
-rw-r--r--debian/patches/32-bit-casts.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/32-bit-casts.patch b/debian/patches/32-bit-casts.patch
new file mode 100644
index 0000000..cb11235
--- /dev/null
+++ b/debian/patches/32-bit-casts.patch
@@ -0,0 +1,30 @@
1From: pedro martelletto <pedro@ambientworks.net>
2Date: Sun, 20 Sep 2020 22:56:30 +0100
3Subject: add two casts to silence warnings on 32-bit
4
5add two casts to silence 'comparison is always false' warnings on
632-bit platforms (gcc: -Werror=type-limits, clang:
7-Wtautological-constant-out-of-range-compare); gh#210
8
9Origin: upstream, https://github.com/Yubico/libfido2/commit/7a17a4e9127fb6df6278f19396760e7d60a5862c
10Bug: https://github.com/Yubico/libfido2/issues/210
11Last-Update: 2020-09-20
12---
13 src/hid_linux.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/hid_linux.c b/src/hid_linux.c
17index 9788012..c554784 100644
18--- a/src/hid_linux.c
19+++ b/src/hid_linux.c
20@@ -385,8 +385,8 @@ timespec_to_ms(const struct timespec *ts, int upper_bound)
21 int64_t x;
22 int64_t y;
23
24- if (ts->tv_sec < 0 || ts->tv_sec > INT64_MAX / 1000LL ||
25- ts->tv_nsec < 0 || ts->tv_nsec / 1000000LL > INT64_MAX)
26+ if (ts->tv_sec < 0 || (uint64_t)ts->tv_sec > INT64_MAX / 1000LL ||
27+ ts->tv_nsec < 0 || (uint64_t)ts->tv_nsec / 1000000LL > INT64_MAX)
28 return (upper_bound);
29
30 x = ts->tv_sec * 1000LL;