[git commit master 1/1] wget: fix fname_out usage wrt redirects
Denys Vlasenko
vda.linux at googlemail.com
Sun Mar 20 23:29:37 UTC 2011
commit: http://git.busybox.net/busybox/commit/?id=625f218d43ee280da52bb7087236ae5807383082
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
networking/wget.c | 10 ++++++++--
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);
--
1.7.3.4
More information about the busybox-cvs
mailing list