[tor-commits] [tor/master] Fix Matthews code to actually use tmp

nickm at torproject.org nickm at torproject.org
Tue Dec 23 18:03:30 UTC 2014

commit c83f18011697d3b3c3434464280271697f79d20a
Author: Francisco Blas Izquierdo Riera (klondike) <klondike at gentoo.org>
Date:   Tue Dec 23 12:55:48 2014 -0500

    Fix Matthews code to actually use tmp
    Matthew's autoaddr code returned an undecorated address when trying to check
    that the code didn't insert an undecorated one into the map.
    This patch fixes this by actually storing the undecorated address in tmp
    instead of buf as it was originally intended.
    This patch is released under the same license as the original file as
    long as the author iscredited.
    Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike at gentoo.org>
 src/or/addressmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 998770a..9062d76 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -888,7 +888,7 @@ addressmap_get_virtual_address(int type)
         /* XXXX This code is to make sure I didn't add an undecorated version
          * by mistake. I hope it's needless. */
         char tmp[TOR_ADDR_BUF_LEN];
-        tor_addr_to_str(buf, &addr, sizeof(tmp), 0);
+        tor_addr_to_str(tmp, &addr, sizeof(tmp), 0);
         if (strmap_get(addressmap, tmp)) {
           log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.",
                    buf, tmp);

More information about the tor-commits mailing list