diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-02 11:58:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-02 11:58:08 -0400 |
| commit | e3c143f5214b4a2d37dbb47940eaf2cc2e212f86 (patch) | |
| tree | 9dc89abc6d5816ae8ced5764124b50238eadce2b /src/or/routerparse.c | |
| parent | 67c0ad54263be7fb742a8d499f97f5908f9ec970 (diff) | |
| parent | efcab439564dcadc5bc14609a9205d73d236e966 (diff) | |
| download | tor-e3c143f5214b4a2d37dbb47940eaf2cc2e212f86.tar.gz tor-e3c143f5214b4a2d37dbb47940eaf2cc2e212f86.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index bdf0809150..337ba57a5a 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -923,7 +923,7 @@ router_parse_list_from_string(const char **s, const char *eos, { routerinfo_t *router; extrainfo_t *extrainfo; - signed_descriptor_t *signed_desc; + signed_descriptor_t *signed_desc = NULL; void *elt; const char *end, *start; int have_extrainfo; @@ -980,6 +980,7 @@ router_parse_list_from_string(const char **s, const char *eos, continue; } if (saved_location != SAVED_NOWHERE) { + tor_assert(signed_desc); signed_desc->saved_location = saved_location; signed_desc->saved_offset = *s - start; } |