]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Ensure ms_remain is always initialized
authordtucker@openbsd.org <dtucker@openbsd.org>
Fri, 3 Mar 2023 10:23:42 +0000 (10:23 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 4 Mar 2023 03:43:10 +0000 (14:43 +1100)
similar to what we do in ssh_packet_write_wait.  bz#2687, from jjelen
at redhat.com.

OpenBSD-Commit-ID: a50e0541cf823f8d1c72f71ccde925d3dbe6dfac

packet.c

index 3f64d2d32854a4819ddd9bcbcd22eba01c6f66ee..fd14f0009e6759ef676cc214ca52e11f5c46a095 100644 (file)
--- 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;