tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
dtucker@openbsd.org 2021-01-15 02:58:11 +00:00 committed by Darren Tucker
parent 5339ab369c
commit 02da325f10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc.c
View File

@ -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)