[git commit] networking: support ftp PASV responses not ending with ')'

Denys Vlasenko vda.linux at googlemail.com
Sun Jul 19 18:59:35 UTC 2020


commit: https://git.busybox.net/busybox/commit/?id=06a407c6283b06307854649e522729a839017401
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Patch by Baruch Burstein <bmburstein at gmail.com>

function                                             old     new   delta
parse_pasv_epsv                                      153     181     +28

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/parse_pasv_epsv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/networking/parse_pasv_epsv.c b/networking/parse_pasv_epsv.c
index 14f4d4258..314237be6 100644
--- a/networking/parse_pasv_epsv.c
+++ b/networking/parse_pasv_epsv.c
@@ -38,6 +38,8 @@ int FAST_FUNC parse_pasv_epsv(char *buf)
 		 * Server's IP is N1.N2.N3.N4 (we ignore it)
 		 * Server's port for data connection is P1*256+P2 */
 		ptr = strrchr(buf, ')');
+		if (!ptr) ptr = strrchr(buf, '\r'); /* for PASV responses not ending with ')' */
+		if (!ptr) ptr = strrchr(buf, '\n'); /* for PASV responses not ending with ')' */
 		if (ptr) *ptr = '\0';
 
 		ptr = strrchr(buf, ',');


More information about the busybox-cvs mailing list