From e8e1426729135c7372b18bc8c97a0bc478ce61b6 Mon Sep 17 00:00:00 2001
From: claudio <claudio@openbsd.org>
Date: Wed, 9 Nov 2022 17:41:05 +0000
Subject: [PATCH] Before printing the redirect URI pass it through stravis
 since it is untrusted input. OK tb@ kn@ millert@

---
 usr.bin/ftp/fetch.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index 7e58e03b1e7..04379afb635 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fetch.c,v 1.211 2022/11/09 16:29:58 claudio Exp $	*/
+/*	$OpenBSD: fetch.c,v 1.212 2022/11/09 17:41:05 claudio Exp $	*/
 /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
 
 /*-
@@ -950,8 +950,13 @@ noslash:
 			loctail = strchr(redirurl, '#');
 			if (loctail != NULL)
 				*loctail = '\0';
-			if (verbose)
-				fprintf(ttyout, "Redirected to %s\n", redirurl);
+			if (verbose) {
+				char *visbuf;
+				if (stravis(&visbuf, redirurl, VIS_SAFE) == -1)
+					err(1, "Cannot vis redirect URL");
+				fprintf(ttyout, "Redirected to %s\n", visbuf);
+				free(visbuf);
+			}
 			ftp_close(&fin, &tls, &fd);
 			rval = url_get(redirurl, proxyenv, savefile, lastfile);
 			free(redirurl);
-- 
2.20.1