diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-05-29 01:20:46 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-05-29 13:28:46 +1000 |
| commit | 1001dd148ed7c57bccf56afb40cb77482ea343a6 (patch) | |
| tree | 15a1e432c9c918ed8a3a83039589c782908db64e /misc.c | |
| parent | 7af1e92cd289b7eaa9a683e9a6f2fddd98f37a01 (diff) | |
| download | openssh-git-1001dd148ed7c57bccf56afb40cb77482ea343a6.tar.gz | |
upstream: Fix multiplier in convtime when handling seconds after
other units. bz#3171, spotted by ronf at timeheart.net, ok djm@.
OpenBSD-Commit-ID: 95b7a848e1083974a65fbb6ccb381d438e1dd5be
Diffstat (limited to 'misc.c')
| -rw-r--r-- | misc.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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) 2005-2020 Damien Miller. All rights reserved. @@ -487,7 +487,7 @@ a2tun(const char *s, int *remote) long convtime(const char *s) { - long total, secs, multiplier = 1; + long total, secs, multiplier; const char *p; char *endp; @@ -505,6 +505,7 @@ convtime(const char *s) secs < 0) return -1; + multiplier = 1; switch (*endp++) { case '\0': endp--; |