sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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


svn:r16617
This commit is contained in:
Nick Mathewson 2008-08-22 02:14:45 +00:00
parent 5ec2950ce0
commit 772a824d56
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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

2
src/or/config.c
View File

@ -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);