From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 20 Mar 2011 23:29:37 +0000 (+0100)
Subject: wget: fix fname_out usage wrt redirects
X-Git-Tag: 1_19_0~225
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=625f218d43ee280da52bb7087236ae5807383082;p=oweals%2Fbusybox.git

wget: fix fname_out usage wrt redirects

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/wget.c b/networking/wget.c
index 9d50437d8..bc922836a 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -604,8 +604,14 @@ static void download_one_url(const char *url)
 		if (G.fname_out[0] == '/' || !G.fname_out[0])
 			G.fname_out = (char*)"index.html";
 		/* -P DIR is considered only if there was no -O FILE */
-		if (G.dir_prefix)
-			G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out);
+		else {
+			if (G.dir_prefix)
+				G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out);
+			else {
+				/* redirects may free target.path later, need to make a copy */
+				G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
+			}
+		}
 	}
 #if ENABLE_FEATURE_WGET_STATUSBAR
 	G.curfile = bb_get_last_path_component_nostrip(G.fname_out);