summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-03-03 10:23:42 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-03-04 14:43:10 +1100
commit4a3918f51bd2d968387e7aa87e33b32c78077fb4 (patch)
treeb8bd214a89ea4dd34d4cceb4d52f876278e0b5ed
parente44846a4487d2885ac7f2610be09b1e2bf52249b (diff)
upstream: Ensure ms_remain is always initialized
similar to what we do in ssh_packet_write_wait. bz#2687, from jjelen at redhat.com. OpenBSD-Commit-ID: a50e0541cf823f8d1c72f71ccde925d3dbe6dfac
-rw-r--r--packet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet.c b/packet.c
index 3f64d2d3..fd14f000 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.308 2022/08/31 02:56:40 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.309 2023/03/03 10:23:42 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1324,7 +1324,7 @@ int
ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
{
struct session_state *state = ssh->state;
- int len, r, ms_remain;
+ int len, r, ms_remain = 0;
struct pollfd pfd;
char buf[8192];
struct timeval start;