diff options
author | wtc%netscape.com <devnull@localhost> | 2003-09-13 13:37:46 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2003-09-13 13:37:46 +0000 |
commit | c99411c01fc5666c662d301539aeb03171198fde (patch) | |
tree | 9caa757f88abc5f5199cb95c817ea10be26dbc69 | |
parent | 096278bbb3438595f17f6e2f1f6f8f01528a8cb8 (diff) | |
download | nspr-hg-c99411c01fc5666c662d301539aeb03171198fde.tar.gz |
Bugzilla bug 219104: handle sockaddr structures that have a sa_len field.
That field should not be copied to PRNetAddr's. The patch is contributed
by David Baron <dbaron@mozilla.org>. r=wtc.
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rw-r--r-- | pr/src/misc/prnetdb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c index 99e6ccd6..58da1094 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c @@ -2135,6 +2135,7 @@ PR_IMPLEMENT(void *) PR_EnumerateAddrInfo(void *iterPtr, if (ai) { /* copy sockaddr to PRNetAddr */ memcpy(result, ai->ai_addr, ai->ai_addrlen); + result->raw.family = ai->ai_addr->sa_family; if (ai->ai_addrlen < sizeof(PRNetAddr)) memset(((char*)result)+ai->ai_addrlen, 0, sizeof(PRNetAddr) - ai->ai_addrlen); |