]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: fix off-by-one error that caused sftp downloads to make
authordjm@openbsd.org <djm@openbsd.org>
Fri, 15 May 2020 03:57:33 +0000 (03:57 +0000)
committerDamien Miller <djm@mindrot.org>
Wed, 27 May 2020 00:09:19 +0000 (10:09 +1000)
one more concurrent request that desired. This prevented using sftp(1) in
unpipelined request/response mode, which is useful when debugging. Patch from
Stephen Goetze in bz#3054

OpenBSD-Commit-ID: 41b394ebe57037dbc43bdd0eef21ff0511191f28

sftp-client.c

index 72f7fff7aa22277c772fa96878d83d426b94dec5..b8e131be67dc939e7f99d198aa75895e236cf260 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.135 2019/10/04 04:31:59 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.136 2020/05/15 03:57:33 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1415,7 +1415,7 @@ do_download(struct sftp_conn *conn, const char *remote_path,
                                            (unsigned long long)offset,
                                            num_req);
                                        max_req = 1;
-                               } else if (max_req <= conn->num_requests) {
+                               } else if (max_req < conn->num_requests) {
                                        ++max_req;
                                }
                        }