diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-08-22 02:14:45 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-08-22 02:14:45 +0000 |
| commit | 772a824d5620e0a1598ab46665ae2af34ec00ad7 (patch) | |
| tree | c404c246eaaf57cb16b9be81cc3c2d7264e1a451 | |
| parent | 5ec2950ce07f1922ef906ebf5482b9199fb03734 (diff) | |
| download | tor-772a824d5620e0a1598ab46665ae2af34ec00ad7.tar.gz tor-772a824d5620e0a1598ab46665ae2af34ec00ad7.zip | |
r17839@tombo: nickm | 2008-08-21 22:14:36 -0400
Fix bogus pointer use (and bug 806) on win32.
svn:r16617
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 f1742e63d2..6c9004dbda 100644 --- 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); |