From 2bfd92d0d170642fb12f53e5da208f318fdd632c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 13 Aug 2014 10:36:06 -0400 Subject: Apply coccinelle script to replace malloc(a*b)->calloc(a,b) --- src/common/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common/util.c') diff --git a/src/common/util.c b/src/common/util.c index 947325108e..d064aceae0 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3392,8 +3392,8 @@ format_win_cmdline_argument(const char *arg) smartlist_add(arg_chars, (void*)&backslash); /* Allocate space for argument, quotes (if needed), and terminator */ - formatted_arg = tor_malloc(sizeof(char) * - (smartlist_len(arg_chars) + (need_quotes?2:0) + 1)); + formatted_arg = tor_calloc(sizeof(char), + (smartlist_len(arg_chars) + (need_quotes ? 2 : 0) + 1)); /* Add leading quote */ i=0; @@ -5022,7 +5022,7 @@ tor_check_port_forwarding(const char *filename, for each smartlist element (one for "-p" and one for the ports), and one for the final NULL. */ args_n = 1 + 2*smartlist_len(ports_to_forward) + 1; - argv = tor_malloc_zero(sizeof(char*)*args_n); + argv = tor_calloc(sizeof(char *), args_n); argv[argv_index++] = filename; SMARTLIST_FOREACH_BEGIN(ports_to_forward, const char *, port) { -- cgit v1.2.3-54-g00ecf