]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: correct comment and use local variable instead of long
authordjm@openbsd.org <djm@openbsd.org>
Fri, 21 Jan 2022 06:58:06 +0000 (06:58 +0000)
committerDamien Miller <djm@mindrot.org>
Mon, 24 Jan 2022 23:33:03 +0000 (10:33 +1100)
indirection; spotted by dtucker@

OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965

packet.c

index d81d01a1c36a11a8fea858b36aaff889c28bb234..5a50fcd9569dcc4da314a3891ef91748f6d84112 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.305 2022/01/17 22:56:04 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.306 2022/01/21 06:58:06 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1760,10 +1760,9 @@ ssh_packet_read_poll_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
 }
 
 /*
- * Buffers the given amount of input characters.  This is intended to be used
- * together with packet_read_poll.
+ * Buffers the supplied input data. This is intended to be used together
+ * with packet_read_poll().
  */
-
 int
 ssh_packet_process_incoming(struct ssh *ssh, const char *buf, u_int len)
 {
@@ -1779,7 +1778,7 @@ ssh_packet_process_incoming(struct ssh *ssh, const char *buf, u_int len)
                state->packet_discard -= len;
                return 0;
        }
-       if ((r = sshbuf_put(ssh->state->input, buf, len)) != 0)
+       if ((r = sshbuf_put(state->input, buf, len)) != 0)
                return r;
 
        return 0;