From 02da325f10b214219eae2bb1bc2d3bf0c2f13f9f Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 15 Jan 2021 02:58:11 +0000 Subject: upstream: Change types in convtime() unit test to int to match change its new type. Add tests for boundary conditions and fix convtime to work up to INT_MAX. ok djm@ OpenBSD-Commit-ID: 01dc0475f1484ac2f47facdfcf9221f9472145de --- misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'misc.c') diff --git a/misc.c b/misc.c index 7aad1b5d..3835056a 100644 --- a/misc.c +++ b/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.159 2021/01/15 02:32:41 dtucker Exp $ */ +/* $OpenBSD: misc.c,v 1.160 2021/01/15 02:58:11 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved. @@ -591,10 +591,10 @@ convtime(const char *s) default: return -1; } - if (secs >= INT_MAX / multiplier) + if (secs > INT_MAX / multiplier) return -1; secs *= multiplier; - if (total >= INT_MAX - secs) + if (total > INT_MAX - secs) return -1; total += secs; if (total < 0) -- cgit v1.2.1