diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-24 09:20:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-24 09:20:26 -0400 |
| commit | ae374e0a56014b72e54adf2afb5676ae6788124c (patch) | |
| tree | c19daa5bd237ca359852c8a268cbf0ebd8ba02f1 | |
| parent | f1613b53c57af05250b71f31eda037bf82f1e725 (diff) | |
| parent | 4a9f6894300781b998b0753dd0f5a388bb61cc91 (diff) | |
| download | tor-ae374e0a56014b72e54adf2afb5676ae6788124c.tar.gz tor-ae374e0a56014b72e54adf2afb5676ae6788124c.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
| -rw-r--r-- | changes/bug22034 | 4 | ||||
| -rw-r--r-- | src/or/control.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug22034 b/changes/bug22034 new file mode 100644 index 0000000000..6d9e188740 --- /dev/null +++ b/changes/bug22034 @@ -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. diff --git a/src/or/control.c b/src/or/control.c index b0a687679d..04cd8e8dc1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2058,7 +2058,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 |