diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-17 20:12:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-17 20:12:13 -0500 |
| commit | ded58777c5332a343a4f427058c56a2e28f440ab (patch) | |
| tree | 4cf7e487cf6dc91bd92e29cd70f2e4566f28b2aa /src | |
| parent | b5d738e4819813569bcb768d176fc1e23a7c0a21 (diff) | |
| parent | c82881a235a686b84ad78d076826f832e3363184 (diff) | |
| download | tor-ded58777c5332a343a4f427058c56a2e28f440ab.tar.gz tor-ded58777c5332a343a4f427058c56a2e28f440ab.zip | |
Merge remote-tracking branch 'dgoulet/bug20629_030_01'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/hs_descriptor.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 1517ccb12e..d381732eff 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1394,15 +1394,10 @@ decode_intro_points(const hs_descriptor_t *desc, retval = 0; err: - if (chunked_desc) { - SMARTLIST_FOREACH(chunked_desc, char *, a, tor_free(a)); - smartlist_free(chunked_desc); - } - if (intro_points) { - SMARTLIST_FOREACH(intro_points, char *, a, tor_free(a)); - smartlist_free(intro_points); - } - + SMARTLIST_FOREACH(chunked_desc, char *, a, tor_free(a)); + smartlist_free(chunked_desc); + SMARTLIST_FOREACH(intro_points, char *, a, tor_free(a)); + smartlist_free(intro_points); return retval; } /* Return 1 iff the given base64 encoded signature in b64_sig from the encoded |