wget: fix fname_out usage wrt redirects
authorDenys Vlasenko <vda.linux@googlemail.com>
Sun, 20 Mar 2011 23:29:37 +0000 (00:29 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sun, 20 Mar 2011 23:29:37 +0000 (00:29 +0100)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/wget.c

index 9d50437d8c0615028043b47d4f633bdb99eb0af9..bc922836a6a69101bdad419da414897397f80887 100644 (file)
@@ -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);