diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-01-15 03:58:11 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-01-18 08:43:43 +0100 |
| commit | 02da325f10b214219eae2bb1bc2d3bf0c2f13f9f (patch) | |
| tree | 829ef240b9f4970e68ddf3ee5026574c49875945 /misc.c | |
| parent | upstream: In waitfd(), when poll returns early we are subtracting (diff) | |
| download | openssh-02da325f10b214219eae2bb1bc2d3bf0c2f13f9f.tar.xz openssh-02da325f10b214219eae2bb1bc2d3bf0c2f13f9f.zip | |
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
Diffstat (limited to 'misc.c')
| -rw-r--r-- | misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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) |