tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Fix multiplier in convtime when handling seconds after

Browse Source 
other units. bz#3171, spotted by ronf at timeheart.net, ok djm@.

OpenBSD-Commit-ID: 95b7a848e1083974a65fbb6ccb381d438e1dd5be
This commit is contained in:
dtucker@openbsd.org 2020-05-29 01:20:46 +00:00 committed by Damien Miller
parent 7af1e92cd2
commit 1001dd148e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.148 2020/05/26 01:06:52 djm Exp $ */ /* $OpenBSD: misc.c,v 1.149 2020/05/29 01:20:46 dtucker Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005-2020 Damien Miller. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved.
@ -487,7 +487,7 @@ a2tun(const char *s, int *remote)
long long
convtime(const char *s) convtime(const char *s)
{ {
long total, secs, multiplier = 1; long total, secs, multiplier;
const char *p; const char *p;
char *endp; char *endp;
@ -505,6 +505,7 @@ convtime(const char *s)
secs < 0) secs < 0)
return -1; return -1;
multiplier = 1;
switch (*endp++) { switch (*endp++) {
case '\0': case '\0':
endp--; endp--;