From bcc2abf116f565d333ac3bdc64c10f5a7e1990fb Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 23 Feb 2012 11:45:05 +0100 Subject: [PATCH] Handle correctly some malloc failures. --- src/ChangeLog | 2 ++ src/main.c | 26 ++++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9364d54d..13ab1ae7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2012-02-23 Giuseppe Scrivano + * main.c (main): Fail gracefully if `malloc' fails. + * gnutls.c (wgnutls_read): Remove unused variables `timer' and `flags'. 2012-02-17 Steven Schubiger diff --git a/src/main.c b/src/main.c index 5aa528de..9eefc98f 100644 --- a/src/main.c +++ b/src/main.c @@ -988,15 +988,20 @@ main (int argc, char **argv) for (i = 1; i < argc; i++) argstring_length += strlen (argv[i]) + 2 + 1; char *p = program_argstring = malloc (argstring_length * sizeof (char)); + if (p == NULL) + { + fprintf (stderr, _("Memory allocation problem\n")); + exit (2); + } for (i = 1; i < argc; i++) - { - *p++ = '"'; - int arglen = strlen (argv[i]); - memcpy (p, argv[i], arglen); - p += arglen; - *p++ = '"'; - *p++ = ' '; - } + { + *p++ = '"'; + int arglen = strlen (argv[i]); + memcpy (p, argv[i], arglen); + p += arglen; + *p++ = '"'; + *p++ = ' '; + } *p = '\0'; /* Load the hard-coded defaults. */ @@ -1355,6 +1360,11 @@ for details.\n\n")); /* Fill in the arguments. */ url = alloca_array (char *, nurl + 1); + if (url == NULL) + { + fprintf (stderr, _("Memory allocation problem\n")); + exit (2); + } for (i = 0; i < nurl; i++, optind++) { char *rewritten = rewrite_shorthand_url (argv[optind]); -- 2.39.2