From 211640d133efdc7487f77a9de7763a0b3b39fb5f Mon Sep 17 00:00:00 2001 From: Dennis Groenen Date: Thu, 12 Jan 2012 21:23:37 +0100 Subject: [PATCH] update BusyBox 1.19.3 hotfixes --- debian/patches/hotfixes/busybox-1.19.3-wget.patch | 29 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 30 insertions(+) create mode 100644 debian/patches/hotfixes/busybox-1.19.3-wget.patch diff --git a/debian/patches/hotfixes/busybox-1.19.3-wget.patch b/debian/patches/hotfixes/busybox-1.19.3-wget.patch new file mode 100644 index 0000000..e98a506 --- /dev/null +++ b/debian/patches/hotfixes/busybox-1.19.3-wget.patch @@ -0,0 +1,29 @@ +--- busybox-1.19.3/networking/wget.c ++++ busybox-1.19.3-wget/networking/wget.c +@@ -552,6 +552,7 @@ static void download_one_url(const char + FILE *dfp; /* socket to ftp server (data) */ + char *proxy = NULL; + char *fname_out_alloc; ++ char *redirected_path = NULL; + struct host_info server; + struct host_info target; + +@@ -794,8 +795,8 @@ However, in real world it was observed t + bb_error_msg_and_die("too many redirections"); + fclose(sfp); + if (str[0] == '/') { +- free(target.allocated); +- target.path = target.allocated = xstrdup(str+1); ++ free(redirected_path); ++ target.path = redirected_path = xstrdup(str+1); + /* lsa stays the same: it's on the same server */ + } else { + parse_url(str, &target); +@@ -850,6 +851,7 @@ However, in real world it was observed t + free(server.allocated); + free(target.allocated); + free(fname_out_alloc); ++ free(redirected_path); + } + + int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/debian/patches/series b/debian/patches/series index 5d6ee04..b90745e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,6 +24,7 @@ ps-accept-and-ignore-missing-options.patch #Hotfixes hotfixes/busybox-1.19.3-getty.patch hotfixes/busybox-1.19.3-modinfo.patch +hotfixes/busybox-1.19.3-wget.patch #Patched pulled from busybox git git-backports/0001-lineedit-fix-atomic-replace-of-history-file-hush-fix.patch -- 1.7.9.5