From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 14 Jun 2008 15:42:29 +0000 (+0000)
Subject: Malloc does not return size_t.  (bug noticed by lodger.)
X-Git-Tag: tor-0.2.1.2-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97c06691b9f4a30db21fcba41c17b95e268b24a0;p=thirdparty%2Ftor.git

Malloc does not return size_t.  (bug noticed by lodger.)

svn:r15252
---

diff --git a/src/or/config.c b/src/or/config.c
index 12cfe18834..6072c808a4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1276,7 +1276,7 @@ options_act(or_options_t *old_options)
 #ifdef WIN32
     if (!strcmp(actual_fname, "<default>")) {
       const char *conf_root = get_windows_conf_root();
-      size_t len = tor_malloc(strlen(conf_root)+16);
+      size_t len = strlen(conf_root)+16;
       tor_free(actual_fname);
       actual_fname = tor_malloc(len+1);
       tor_snprintf(actual_fname, len, "%s\\geoip", conf_root);