diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:26:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:26:28 -0400 |
| commit | a201a5396e9aef779386216e2a21bfeb75d3d9c6 (patch) | |
| tree | b2543378e963b13857dca542d64739f040413ed9 /src/or/routerparse.c | |
| parent | 24352d0d70542d43588a5c5a6da3f63a317d049d (diff) | |
| parent | 047555214056da24d682d47562a88e53563e49ff (diff) | |
| download | tor-a201a5396e9aef779386216e2a21bfeb75d3d9c6.tar.gz tor-a201a5396e9aef779386216e2a21bfeb75d3d9c6.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
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 6a477470c4..fd3971c587 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4809,7 +4809,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; @@ -4818,8 +4818,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; @@ -4923,8 +4925,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); |