From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 2 Nov 2014 17:08:51 +0000 (-0500)
Subject: Use tor_malloc_zero(x), not tor_calloc(x,sizeof(char))
X-Git-Tag: tor-0.2.6.2-alpha~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a142fc29aff4b47640a1a4f59032e25b7360e847;p=thirdparty%2Ftor.git

Use tor_malloc_zero(x), not tor_calloc(x,sizeof(char))

(Also, fixes a wide line.)
---

diff --git a/src/common/util.c b/src/common/util.c
index 77102837db..27cc9df878 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3465,8 +3465,9 @@ 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_calloc((smartlist_len(arg_chars) + (need_quotes ? 2 : 0) + 1),
-                             sizeof(char));
+  const size_t formatted_arg_len = smartlist_len(arg_chars) +
+    (need_quotes ? 2 : 0) + 1;
+  formatted_arg = tor_malloc_zero(formatted_arg_len);
 
   /* Add leading quote */
   i=0;