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

diff --git a/misc.c b/misc.c
index 7aad1b5df34056939d45f7c47b9f15017828f22c..3835056adfb546953391e576f639991837eb53ea 100644 (file)
--- 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)