aboutsummaryrefslogtreecommitdiff
path: root/lib/urldata.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-11-03 16:24:56 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-11-03 16:24:56 +0000
commitd0b8b5a1990a31f37fcab925cb8b59bee958d41d (patch)
tree01f76987f143f68e2a4633f7cae8dcdc4b22a556 /lib/urldata.h
parentefe2ce3647b751d137c105c3b08b8290fb1f801c (diff)
- Bug #2218480 (http://curl.haxx.se/bug/view.cgi?id=2218480) pointed out a
problem with my CURLINFO_PRIMARY_IP fix from October 7th that caused a NULL pointer read. I also took the opportunity to clean up this logic (storing of the connection's IP address) somewhat as we had it stored in two different places and ways previously and they are now unified.
Diffstat (limited to 'lib/urldata.h')
-rw-r--r--lib/urldata.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/urldata.h b/lib/urldata.h
index 4d24f1cab..42da3e862 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -908,11 +908,10 @@ struct connectdata {
cache entry remains locked. It gets unlocked in Curl_done() */
Curl_addrinfo *ip_addr;
- /* 'ip_addr_str' is the ip_addr data as a human readable malloc()ed string.
+ /* 'ip_addr_str' is the ip_addr data as a human readable string.
It remains available as long as the connection does, which is longer than
- the ip_addr itself. Set with Curl_store_ip_addr() when ip_addr has been
- set. */
- char *ip_addr_str;
+ the ip_addr itself. */
+ char ip_addr_str[MAX_IPADR_LEN];
unsigned int scope; /* address scope for IPv6 */