phpged/unit
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity

Fixed INET6 sockaddr processing in nxt_sockaddr_text().

Browse source
This commit is contained in:
Igor Sysoev 2017-06-27 20:06:59 +03:00
parent cf3e714c39
commit 2006e9f537
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nxt_sockaddr.c
View file

@ -222,7 +222,7 @@ nxt_sockaddr_text(nxt_sockaddr_t *sa)
offset = offsetof(nxt_sockaddr_t, u) + sizeof(struct sockaddr_in6);
sa->start = offset;
sa->address_start = offset;
sa->address_start = offset + 1;
start = nxt_pointer_to(sa, offset);
p = start;
@ -479,11 +479,14 @@ nxt_sockaddr_ntop(nxt_sockaddr_t *sa, u_char *buf, u_char *end, nxt_bool_t port)
static u_char *
nxt_inet6_ntop(u_char *addr, u_char *buf, u_char *end)
{
u_char *p;
size_t zero_groups, last_zero_groups, ipv6_bytes;
nxt_uint_t i, zero_start, last_zero_start;
u_char *p;
size_t zero_groups, last_zero_groups, ipv6_bytes;
nxt_uint_t i, zero_start, last_zero_start;
if (buf + NXT_INET6_ADDR_STR_LEN > end) {
const size_t max_inet6_length =
sizeof("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") - 1;
if (buf + max_inet6_length > end) {
return buf;
}