diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:25:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:25:37 -0400 |
| commit | fe69a7e1d7658d3202af0c2c7308d342faaa1559 (patch) | |
| tree | 9a713f7649647586825075823f456d3d710a4a60 /src/or/routerparse.c | |
| parent | 3781955f079f25f8d6aa47cb746e339497076050 (diff) | |
| parent | 7451b4cafededa95da0099ea2444224d941eef52 (diff) | |
| download | tor-fe69a7e1d7658d3202af0c2c7308d342faaa1559.tar.gz tor-fe69a7e1d7658d3202af0c2c7308d342faaa1559.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f990cebd82..b59b0ad4f2 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4684,7 +4684,7 @@ rend_parse_introduction_points(rend_service_descriptor_t *parsed, size_t intro_points_encoded_size) { const char *current_ipo, *end_of_intro_points; - smartlist_t *tokens; + smartlist_t *tokens = NULL; directory_token_t *tok; rend_intro_point_t *intro; extend_info_t *info; @@ -4693,8 +4693,10 @@ rend_parse_introduction_points(rend_service_descriptor_t *parsed, tor_assert(parsed); /** Function may only be invoked once. */ tor_assert(!parsed->intro_nodes); - tor_assert(intro_points_encoded); - tor_assert(intro_points_encoded_size > 0); + if (!intro_points_encoded || intro_points_encoded_size == 0) { + log_warn(LD_REND, "Empty or zero size introduction point list"); + goto err; + } /* Consider one intro point after the other. */ current_ipo = intro_points_encoded; end_of_intro_points = intro_points_encoded + intro_points_encoded_size; @@ -4798,8 +4800,10 @@ rend_parse_introduction_points(rend_service_descriptor_t *parsed, done: /* Free tokens and clear token list. */ - SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); - smartlist_free(tokens); + if (tokens) { + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); + smartlist_free(tokens); + } if (area) memarea_drop_all(area); |