[or-cvs] [tor/master] Fix a strdup() of uninitialized buffer in addressmap_get_virtual_address

[nickm at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Thu, 6 Jan 2011 13:40:27 -0500
Subject: Fix a strdup() of uninitialized buffer in addressmap_get_virtual_address
Commit: 3bc235d97975dfa17ca6732a930b28124b92eef5

Partial revert of 22f723e4a3fc32983480c7403af9d7e77a3200ea.

Bugfix on 0.2.3.0-alpha
---
 src/or/connection_edge.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 8bfc8b4..463d020 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1200,6 +1200,7 @@ addressmap_get_virtual_address(int type)
   } else if (type == RESOLVED_TYPE_IPV4) {
     // This is an imperfect estimate of how many addresses are available, but
     // that's ok.
+    struct in_addr in;
     uint32_t available = 1u << (32-virtual_addr_netmask_bits);
     while (available) {
       /* Don't hand out any .0 or .255 address. */
@@ -1211,7 +1212,9 @@ addressmap_get_virtual_address(int type)
           return NULL;
         }
       }
-      if (!strmap_get(addressmap, fmt_addr32(next_virtual_addr))) {
+      in.s_addr = htonl(next_virtual_addr);
+      tor_inet_ntoa(&in, buf, sizeof(buf));
+      if (!strmap_get(addressmap, buf)) {
         ++next_virtual_addr;
         break;
       }
-- 
1.7.1