Changeset 5146 for pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c

Timestamp:

Aug 5, 2015 6:31:45 AM (9 years ago)

Author:

ming

Message:

Fixed #1874: Truncated IPv6 address during address lookup on iOS

Thanks to Brian Walker for the patch.

File:

• pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c

@@ -130 +130 @@
             for (idx = 0; idx < naddr && i < *count; idx++) {
                 struct sockaddr *addr;
+                size_t addr_size;
                 
                 addr = (struct sockaddr *)
@@ -144 +145 @@
                 
                 /* Store address */
-                PJ_ASSERT_ON_FAIL(sizeof(*addr) <= sizeof(pj_sockaddr),
-                                  continue);
-                pj_memcpy(&ai[i].ai_addr, addr, sizeof(*addr));
+                addr_size = sizeof(*addr);
+                if (af == PJ_AF_INET6) {
+                    addr_size = addr->sa_len;
+                }
+                PJ_ASSERT_ON_FAIL(addr_size <= sizeof(pj_sockaddr),                               continue);
+                pj_memcpy(&ai[i].ai_addr, addr, addr_size);
                 PJ_SOCKADDR_RESET_LEN(&ai[i].ai_addr);