Backport: Apply rovv's patch for bug 864: avoid null error on detached signature handling failure.

svn:r17447
This commit is contained in:
Nick Mathewson 2008-12-02 19:16:11 +00:00
parent 0d091964dd
commit d33880d0df
2 changed files with 10 additions and 1 deletions

View File

@ -4,6 +4,13 @@ Changes in version 0.2.0.33 - 200?-??-??
could make gcc generate non-functional binary search code. Bugfix
on 0.2.0.10-alpha.
- Build correctly on platforms without socklen_t.
- Avoid potential crash on internal error during signature collection.
Fixes bug 864. Patch from rovv.
o Minor features:
- Report the case where all signatures in a detached set are rejected
differently than the case where there is an error handling the detached
set.
Changes in version 0.2.0.32 - 2008-11-20

View File

@ -1909,13 +1909,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)