From 3505e38bd1e5714fa1203e6752c573861aab8521 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 22 Aug 2017 15:53:16 +0200 Subject: sendmail: fix segfault if "To: email1,email2" is used Signed-off-by: Denys Vlasenko --- mailutils/sendmail.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index f440e6319..defbd9552 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c @@ -189,8 +189,9 @@ static void rcptto(const char *s) // send to a list of comma separated addresses static void rcptto_list(const char *list) { - char *str = xstrdup(list); - char *s = str; + char *free_me = xstrdup(list); + char *str = free_me; + char *s = free_me; char prev = 0; int in_quote = 0; @@ -208,7 +209,7 @@ static void rcptto_list(const char *list) } if (prev != ',') rcptto(angle_address(str)); - free(str); + free(free_me); } int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -- cgit v1.2.3-55-g6feb From 6bafcfb67a30dde668cceeab7669082fbcf5a489 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Tue, 22 Aug 2017 16:33:06 +0100 Subject: tar: fix handling of first argument without '-' The following no longer works as expected: $ ./busybox tar xfz test.tgz tar: can't open 'z': No such file or directory Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko --- archival/tar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archival/tar.c b/archival/tar.c index 9a5bcc7fe..6cf3508ec 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -953,9 +953,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv) if (getuid() != 0) tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM; - /* Prepend '-' to the first argument if required */ - if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') - argv[1] = xasprintf("-%s", argv[1]); #if ENABLE_DESKTOP /* Lie to buildroot when it starts asking stupid questions. */ if (argv[1] && strcmp(argv[1], "--version") == 0) { @@ -992,6 +989,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv) } } #endif + /* Prepend '-' to the first argument if required */ + if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') + argv[1] = xasprintf("-%s", argv[1]); opt = GETOPT32(argv, "^" "txC:f:Oopvk" IF_FEATURE_TAR_CREATE( "ch" ) -- cgit v1.2.3-55-g6feb