diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-13 09:40:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-13 09:40:32 -0400 |
| commit | 25dddf7a8f30699242b52fce115f29401f63ee9c (patch) | |
| tree | 1b353ff92a3f30b3e8a94804f580b223555ac906 /src/or/control.c | |
| parent | 74a534be15a26cddb8b134757416a7550072f44b (diff) | |
| parent | e602c4031b57f0780661ce0473a5e30d187d385c (diff) | |
| download | tor-25dddf7a8f30699242b52fce115f29401f63ee9c.tar.gz tor-25dddf7a8f30699242b52fce115f29401f63ee9c.zip | |
Merge remote-tracking branch 'public/bug8822' into 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 88bd00b5e3..a88de12d69 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1711,8 +1711,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/")) { @@ -1722,8 +1721,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/")) { |