diff options
| author | glebius <glebius@FreeBSD.org> | 2016-12-07 23:19:46 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2016-12-07 23:19:46 +0000 |
| commit | 6a7e18ff00902471666a295326db834bf51d175a (patch) | |
| tree | 1a68da9a44322fc6ebd0726070fad622076ae3a7 | |
| parent | 079734d71a4baf6f600038454f133b25624080b0 (diff) | |
| download | FreeBSD-src-6a7e18ff00902471666a295326db834bf51d175a.zip FreeBSD-src-6a7e18ff00902471666a295326db834bf51d175a.tar.gz | |
Merge rr309688: address regressions in SA-16:37.libc.
PR: 215105
Submitted by: <jtd2004a sbcglobal.net>
| -rw-r--r-- | lib/libc/net/linkaddr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c index c62b9f9..9432a53 100644 --- a/lib/libc/net/linkaddr.c +++ b/lib/libc/net/linkaddr.c @@ -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; @@ -142,11 +142,11 @@ 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--; } @@ -154,15 +154,14 @@ link_ntoa(const struct sockaddr_dl *sdl) 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) break; *out++ = hexlist[i]; - rem++; + rem--; } } *out = 0; |
