commit 29b7397ebe0d2888c9c27f51d3bcdf0d347ee463 Author: Nick Mathewson nickm@torproject.org Date: Thu May 1 13:27:20 2014 -0400

Fix test_config_write_to_data_subdir

Bugfix on aa0eb2022342798fc78b2bde89d393f37c59fe78; bugfix not on any released Tor. --- src/test/test_config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c index d3e3252..94ac4dc 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -277,11 +277,12 @@ test_config_write_to_data_subdir(void *arg) "accusam et justo duo dolores et\n" "ea rebum. Stet clita kasd gubergren, no sea takimata\n" "sanctus est Lorem ipsum dolor sit amet."; - char* filepath = get_datadir_fname2(subdir, fname); + char* filepath = NULL; (void)arg;

tor_free(options->DataDirectory); datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1")); + filepath = get_datadir_fname2(subdir, fname);

#if defined (_WIN32) && !defined (WINCE) tt_int_op(mkdir(options->DataDirectory), ==, 0);