diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-25 16:54:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-25 16:54:06 -0500 |
| commit | b1bd30c24c4d9ee1a760c0fb28e18bc597bb0df5 (patch) | |
| tree | 4e5b4f2a9dee2cc0a34c6c009870aa1a7da86bd8 | |
| parent | d6c18c5804f12f8f4428abce11fc47c64d2a0dd0 (diff) | |
| download | tor-b1bd30c24c4d9ee1a760c0fb28e18bc597bb0df5.tar tor-b1bd30c24c4d9ee1a760c0fb28e18bc597bb0df5.tar.gz | |
Make the pt/transports test not crash.
| -rw-r--r-- | src/or/transports.c | 4 | ||||
| -rw-r--r-- | src/test/test_pt.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/or/transports.c b/src/or/transports.c index 5e96b39a3..10155c447 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -699,9 +699,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) err: mp->conf_state = PT_PROTO_BROKEN; log_warn(LD_CONFIG, "Managed proxy at '%s' failed the configuration protocol" - " and will be destroyed.", mp->argv[0]); - - return; + " and will be destroyed.", mp->argv ? mp->argv[0] : ""); } /** Parses an ENV-ERROR <b>line</b> and warns the user accordingly. */ diff --git a/src/test/test_pt.c b/src/test/test_pt.c index f97b21fa0..45f441106 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -91,7 +91,7 @@ test_pt_protocol(void) { char line[200]; - managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t)); + managed_proxy_t *mp = tor_malloc_zero(sizeof(managed_proxy_t)); mp->conf_state = PT_PROTO_LAUNCHED; mp->transports = smartlist_create(); |