r17839@tombo: nickm | 2008-08-21 22:14:36 -0400

 Fix bogus pointer use (and bug 806) on win32.

svn:r16617

diff --git a/ChangeLog b/ChangeLog
index 868753b525e023e193049d13373a28a3453fa6d4..9b350456079de25c41d9fff3aea38a7bc238af2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Changes in version 0.2.0.31 - 2008-08-??
       794; bug spotted by rovv.  Bugfix on 0.2.0.1-alpha.
     - Correctly detect the presence of the linux/netfilter_ipv4.h header
       when building against recent kernels.  Bugfix on 0.1.2.1-alpha.
+    - Pick size of default geoip filename string correctly on windows.
+      Fixes bug 806. Bugfix on 0.2.0.30.
 
 
 Changes in version 0.2.0.30 - 2008-07-15

diff --git a/src/or/config.c b/src/or/config.c
index f1742e63d21286edf0defd7b7ca648b26187fc11..6c9004dbdafb29b8f12dc14f373c18d2851fc982 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1265,7 +1265,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);