[or-cvs] r16617: {tor} Fix bogus pointer use (and bug 806) on win32. (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-08-21 22:14:45 -0400 (Thu, 21 Aug 2008)
New Revision: 16617

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/config.c
Log:
 r17839 at tombo:  nickm | 2008-08-21 22:14:36 -0400
 Fix bogus pointer use (and bug 806) on win32.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r17839] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-08-22 02:14:43 UTC (rev 16616)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-08-22 02:14:45 UTC (rev 16617)
@@ -11,6 +11,8 @@
       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

Modified: tor/branches/tor-0_2_0-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/config.c	2008-08-22 02:14:43 UTC (rev 16616)
+++ tor/branches/tor-0_2_0-patches/src/or/config.c	2008-08-22 02:14:45 UTC (rev 16617)
@@ -1265,7 +1265,7 @@
 #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);