diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-12-02 19:13:23 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-12-02 19:13:23 +0000 |
| commit | 9c65195449c659a4dc940ae377c6728919dddef4 (patch) | |
| tree | 2c4a1dd0fc7160cfe4db5a3fbb36c749c169a0f9 /src | |
| parent | 60738daf854ee592b41a140dbc2ea226729c0deb (diff) | |
| download | tor-9c65195449c659a4dc940ae377c6728919dddef4.tar tor-9c65195449c659a4dc940ae377c6728919dddef4.tar.gz | |
Apply rovv's patch for bug 864: avoid null error on detached signature handling failure.
svn:r17446
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/dirvote.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 69c5e09a1..8fe53c795 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2082,13 +2082,15 @@ dirvote_add_signatures_to_pending_consensus( tor_free(pending_consensus_signatures); pending_consensus_signatures = new_detached; *msg_out = "Signatures added"; + } else if (r == 0) { + *msg_out = "Signatures ignored"; } else { goto err; } goto done; err: - if (!msg_out) + if (!*msg_out) *msg_out = "Unrecognized error while adding detached signatures."; done: if (sigs) |