summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-03-20 23:29:37 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-03-20 23:29:37 (GMT)
commit625f218d43ee280da52bb7087236ae5807383082 (patch)
tree531af0b0268a4f818dbe0a025eede0f6ec08dd9b
parentc2fda8642dc917e3a95f1a556b0876249a1bb321 (diff)
downloadbusybox-625f218d43ee280da52bb7087236ae5807383082.tar.gz
busybox-625f218d43ee280da52bb7087236ae5807383082.tar.bz2
wget: fix fname_out usage wrt redirects
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/wget.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/networking/wget.c b/networking/wget.c
index 9d50437..bc92283 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);