sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2017-04-24 09:31:28 -04:00
parent e0d8ce3b27 4a9f689430
commit af9bbaa8c2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug22034 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (control port, regression):
- The GETINFO extra-info/digest/<digest> command was broken because of a
wrong base16 decode return value check. In was introduced in a refactor
of that API. Fixex bug #22034; bugfix on tor-0.2.9.1-alpha.

2
src/or/control.c
View File

@ -2055,7 +2055,7 @@ getinfo_helper_dir(control_connection_t *control_conn,
char d[DIGEST_LEN];
signed_descriptor_t *sd = NULL;
if (base16_decode(d, sizeof(d), question, strlen(question))
!= sizeof(d)) {
== sizeof(d)) {
/* XXXX this test should move into extrainfo_get_by_descriptor_digest,
* but I don't want to risk affecting other parts of the code,
* especially since the rules for using our own extrainfo (including