diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-13 09:43:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-13 09:43:53 -0400 |
| commit | 29498491432040168c5df7091097a7b8a9c9ad86 (patch) | |
| tree | b7aca414665a3cdecf20077de48c9f44393023f3 /src/or/control.c | |
| parent | 8c69207793ecbe8404396493ae60ea3a21fb968b (diff) | |
| parent | 25dddf7a8f30699242b52fce115f29401f63ee9c (diff) | |
| download | tor-29498491432040168c5df7091097a7b8a9c9ad86.tar.gz tor-29498491432040168c5df7091097a7b8a9c9ad86.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/control.c b/src/or/control.c index a59300d0f4..cc917c46aa 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1712,8 +1712,7 @@ getinfo_helper_dir(control_connection_t *control_conn, const node_t *node = node_get_by_hex_id(question+strlen("md/id/")); const microdesc_t *md = NULL; if (node) md = node->md; - if (md) { - tor_assert(md->body); + if (md && md->body) { *answer = tor_strndup(md->body, md->bodylen); } } else if (!strcmpstart(question, "md/name/")) { @@ -1723,8 +1722,7 @@ getinfo_helper_dir(control_connection_t *control_conn, /* XXXX duplicated code */ const microdesc_t *md = NULL; if (node) md = node->md; - if (md) { - tor_assert(md->body); + if (md && md->body) { *answer = tor_strndup(md->body, md->bodylen); } } else if (!strcmpstart(question, "desc-annotations/id/")) { |