summaryrefslogtreecommitdiff
path: root/sftp-client.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-05-15 03:57:33 +0000
committerDamien Miller <djm@mindrot.org>2020-05-27 10:09:19 +1000
commitaf8b16fb2cce880341c0ee570ceb0d84104bdcc0 (patch)
tree717c4e3e9ab19f1ac723acf3f6853cb9b3602961 /sftp-client.c
parentd7d753e2979f2d3c904b03a08d30856cd2a6e892 (diff)
downloadopenssh-git-af8b16fb2cce880341c0ee570ceb0d84104bdcc0.tar.gz
upstream: fix off-by-one error that caused sftp downloads to make
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
Diffstat (limited to 'sftp-client.c')
-rw-r--r--sftp-client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-client.c b/sftp-client.c
index 72f7fff7..b8e131be 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -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;
}
}