Skip to content

Commit

Permalink
Merge r309688: address regressions in SA-16:37.libc.
Browse files Browse the repository at this point in the history 
PR:		215105
Submitted by:	<jtd2004a sbcglobal.net>
Approved by:	so
  • Loading branch information
@glebius @fichtner
glebius authored and fichtner committed Dec 8, 2016
1 parent c2e31d7 commit f40a659
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 4 additions & 0 deletions UPDATING
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.

20161208 p5 FreeBSD-SA-16:37.libc [revised]

Fix regressions introduced by SA-16:37.libc.

20161206 p4 FreeBSD-SA-16:36.telnetd
FreeBSD-SA-16:37.libc
FreeBSD-SA-16:38.bhyve
Expand Down
9 changes: 4 additions & 5 deletions lib/libc/net/linkaddr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ link_ntoa(const struct sockaddr_dl *sdl)
static char obuf[64];
_Static_assert(sizeof(obuf) >= IFNAMSIZ + 20, "obuf is too small");
char *out;
const char *in, *inlim;
const u_char *in, *inlim;
int namelen, i, rem;

namelen = (sdl->sdl_nlen <= IFNAMSIZ) ? sdl->sdl_nlen : IFNAMSIZ;
Expand All @@ -142,21 +142,20 @@ link_ntoa(const struct sockaddr_dl *sdl)
}
}

in = (const char *)sdl->sdl_data + sdl->sdl_nlen;
in = (const u_char *)sdl->sdl_data + sdl->sdl_nlen;
inlim = in + sdl->sdl_alen;

while (in < inlim && rem > 1) {
if (in != (const char *)sdl->sdl_data + sdl->sdl_nlen) {
if (in != (const u_char *)sdl->sdl_data + sdl->sdl_nlen) {
*out++ = '.';
rem--;
}
i = *in++;
if (i > 0xf) {
if (rem < 3)
break;
*out++ = hexlist[i >> 4];
*out++ = hexlist[i & 0xf];
i >>= 4;
*out++ = hexlist[i];
rem -= 2;
} else {
if (rem < 2)
Expand Down
2 changes: 1 addition & 1 deletion sys/conf/newvers.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

TYPE="FreeBSD"
REVISION="11.0"
BRANCH="RELEASE-p4"
BRANCH="RELEASE-p5"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Expand Down

0 comments on commit f40a659

Please sign in to comment.