diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
| commit | b998431a33db2be0246f176ea0077b98d5258866 (patch) | |
| tree | d03935b5fbc9e8f6327af93b2897fc1f34d931fe /src/common/util.c | |
| parent | 8b62a738b3add64dcd26a82dff44a7e9e11ff5a9 (diff) | |
| parent | b7cf7bd9ae31aeddd03ad2094dd480d2b1d34d4f (diff) | |
| download | tor-b998431a33db2be0246f176ea0077b98d5258866.tar.gz tor-b998431a33db2be0246f176ea0077b98d5258866.zip | |
Merge branch '024_msvc_squashed'
Conflicts:
src/or/or.h
srcwin32/orconfig.h
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c index 5d2135411a..49ec75dc4a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4919,7 +4919,8 @@ tor_check_port_forwarding(const char *filename, status = tor_spawn_background(filename, argv, NULL, &child_handle); #endif - tor_free(argv); + tor_free_((void*)argv); + argv=NULL; if (PROCESS_STATUS_ERROR == status) { log_warn(LD_GENERAL, "Failed to start port forwarding helper %s", |