aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-11-01 15:52:43 -0400
committerNick Mathewson <nickm@torproject.org>2010-11-01 15:52:43 -0400
commitc109ffaef9a166e99778e401deaa4d842d749d40 (patch)
treefda258d93f2613a57373185c72f2105f083b898b /src
parentda0912c00c993b62040f33d2fa57637f010eb7e4 (diff)
downloadtor-c109ffaef9a166e99778e401deaa4d842d749d40.tar
tor-c109ffaef9a166e99778e401deaa4d842d749d40.tar.gz
Fix bug in tor_parse_string when Address is given as a dotted quad.
Found by Ian Goldberg and Mashael AlSabah. Bugfix on 0.2.3.0-alpha dev.
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index afabf8069..7dbe91a7c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2413,6 +2413,9 @@ resolve_my_address(int warn_severity, or_options_t *options,
}
}
}
+ } else {
+ addr = ntohl(in.s_addr); /* set addr so that addr_string is not
+ * illformed */
}
addr_string = tor_dup_ip(addr);