From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 15 May 2020 03:57:33 +0000 (+0000)
Subject: upstream: fix off-by-one error that caused sftp downloads to make
X-Git-Tag: V_8_4_P1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af8b16fb2cce880341c0ee570ceb0d84104bdcc0;p=thirdparty%2Fopenssh-portable.git

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
---

diff --git a/sftp-client.c b/sftp-client.c
index 72f7fff7a..b8e131be6 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;
 				}
 			}