diff options
| author | Damien Miller <djm@mindrot.org> | 2013-12-29 17:44:29 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-12-29 17:44:29 +1100 |
| commit | bb3dafe7024a5b4e851252e65ee35d45b965e4a8 (patch) | |
| tree | b36a42f7f0a058295c02b39c8b2839548d0de19b /serverloop.c | |
| parent | ef275ead3dcadde4db1efe7a0aa02b5e618ed40c (diff) | |
- dtucker@cvs.openbsd.org 2013/12/19 00:19:12
[serverloop.c]
Cast client_alive_interval to u_int64_t before assinging to
max_time_milliseconds to avoid potential integer overflow in the timeout.
bz#2170, patch from Loganaden Velvindron, ok djm@
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c index ccbad617..5b2f8028 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.168 2013/07/12 00:19:59 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.169 2013/12/19 00:19:12 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -304,7 +304,8 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, if (compat20 && max_time_milliseconds == 0 && options.client_alive_interval) { client_alive_scheduled = 1; - max_time_milliseconds = options.client_alive_interval * 1000; + max_time_milliseconds = + (u_int64_t)options.client_alive_interval * 1000; } if (compat20) { |