From e21315b9b4d41987479427ed203ae402695ec4df Mon Sep 17 00:00:00 2001 From: Tim Ruehsen Date: Sat, 11 May 2013 17:11:51 +0200 Subject: [PATCH 3/3] warn before abort() in main.c/no_prefix --- src/ChangeLog | 4 ++++ src/main.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3b6733e..bcff0f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-05-11 Tim Ruehsen + + * main.c (init_switches): warn before abort() in no_prefix() + 2013-05-09 Tim Ruehsen * cookies.c, ftp-ls.c, ftp.c, init.c, netrc.c, utils.c, utils.h: diff --git a/src/main.c b/src/main.c index 2b42d2d..70ce651 100644 --- a/src/main.c +++ b/src/main.c @@ -320,13 +320,15 @@ static struct cmdline_option option_data[] = static char * no_prefix (const char *s) { - static char buffer[1024]; + static char buffer[2048]; static char *p = buffer; char *cp = p; int size = 3 + strlen (s) + 1; /* "no-STRING\0" */ - if (p + size >= buffer + sizeof (buffer)) + if (p + size >= buffer + sizeof (buffer)) { + fprintf (stderr, _("Internal error: size of 'buffer' in main.c/no-prefix() must be increased\n")); abort (); + } cp[0] = 'n', cp[1] = 'o', cp[2] = '-'; strcpy (cp + 3, s); @@ -352,6 +354,7 @@ init_switches (void) { char *p = short_options; size_t i, o = 0; + for (i = 0; i < countof (option_data); i++) { struct cmdline_option *opt = &option_data[i]; -- 1.7.10.4