[tor-commits] [tor/release-0.3.0] control: Wrong check on base16_decode return value

[nickm@xxxxxxxxxxxxxx]

commit 4a9f6894300781b998b0753dd0f5a388bb61cc91
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Fri Apr 21 11:49:30 2017 -0400

    control: Wrong check on base16_decode return value
    
    The GETINFO extra-info/digest/<digest> broke in commit 568dc27a19 that
    refactored the base16_decode() API to return the decoded length.
    Unfortunately, that if() condition should have checked for the correct length
    instead of an error which broke the command in tor-0.2.9.1-alpha.
    
    Fixes #22034
    
    Signed-off-by: David Goulet <dgoulet@xxxxxxxxxxxxxx>
---
 changes/bug22034 | 4 ++++
 src/or/control.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22034 b/changes/bug22034
new file mode 100644
index 0000000..6d9e188
--- /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 c8c5062..1bf1e33 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits