diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-21 10:34:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-21 10:34:29 -0400 |
| commit | 377b5c0510478994fccc4c8931cbce136eb41a5b (patch) | |
| tree | 0ee028e9a60ada8d918ad37a01c8fb507bdf1909 /src/or/rendservice.c | |
| parent | c9cac69ac68d8cdc66d3592f0812988336a1cf8d (diff) | |
| download | tor-377b5c0510478994fccc4c8931cbce136eb41a5b.tar.gz tor-377b5c0510478994fccc4c8931cbce136eb41a5b.zip | |
Allow rend_service_intro_free to get called with NULL
(We allowed it previously, but produced an LD_BUG message when it
happened, which is not consistent
Also, remove inconsistent NULL checks before calling
rend_service_intro_free.
(Removing the check is for CID 718613)
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 629e42cdf2..0633c35fbb 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1446,10 +1446,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, memwipe(hexcookie, 0, sizeof(hexcookie)); /* Free the parsed cell */ - if (parsed_req) { - rend_service_free_intro(parsed_req); - parsed_req = NULL; - } + rend_service_free_intro(parsed_req); /* Free rp if we must */ if (need_rp_free) extend_info_free(rp); @@ -1539,7 +1536,6 @@ void rend_service_free_intro(rend_intro_cell_t *request) { if (!request) { - log_info(LD_BUG, "rend_service_free_intro() called with NULL request!"); return; } @@ -1648,7 +1644,7 @@ rend_service_begin_parse_intro(const uint8_t *request, goto done; err: - if (rv) rend_service_free_intro(rv); + rend_service_free_intro(rv); rv = NULL; if (err_msg_out && !err_msg) { tor_asprintf(&err_msg, |