From bee5f692211f2fe9b89047fbf6d489470a70511e Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Sat, 13 Sep 2003 13:37:46 +0000 Subject: [PATCH] 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 . r=wtc. Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH git-svn-id: svn://10.0.0.236/branches/NSPRPUB_PRE_4_2_CLIENT_BRANCH@146827 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/pr/src/misc/prnetdb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mozilla/nsprpub/pr/src/misc/prnetdb.c b/mozilla/nsprpub/pr/src/misc/prnetdb.c index 99e6ccd6ff7..58da1094066 100644 --- a/mozilla/nsprpub/pr/src/misc/prnetdb.c +++ b/mozilla/nsprpub/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);