diff options
| author | dim <dim@FreeBSD.org> | 2015-09-22 22:18:36 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-22 22:18:36 +0000 |
| commit | d61f0d555c91cafefd45aa3af4f5dde90e0d2da3 (patch) | |
| tree | bc690d9284cc4271ab0cd72aa94e5ab0120e53a2 /sbin | |
| parent | 3606495e8736021e5110ce62eacbe9816f0015e7 (diff) | |
| download | FreeBSD-src-d61f0d555c91cafefd45aa3af4f5dde90e0d2da3.zip FreeBSD-src-d61f0d555c91cafefd45aa3af4f5dde90e0d2da3.tar.gz | |
MFC r286702:
In ipfw2, avoid left-shifting negative integers, which is undefined.
While here, make some other arguments to htonl(3) unsigned too.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ipfw/ipfw2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 25d6afd..587362a 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -2268,14 +2268,14 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int cblen) case '/': masklen = atoi(p); if (masklen == 0) - d[1] = htonl(0); /* mask */ + d[1] = htonl(0U); /* mask */ else if (masklen > 32) errx(EX_DATAERR, "bad width ``%s''", p); else - d[1] = htonl(~0 << (32 - masklen)); + d[1] = htonl(~0U << (32 - masklen)); break; case '{': /* no mask, assume /24 and put back the '{' */ - d[1] = htonl(~0 << (32 - 24)); + d[1] = htonl(~0U << (32 - 24)); *(--p) = md; break; @@ -2284,7 +2284,7 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int cblen) /* FALLTHROUGH */ case 0: /* initialization value */ default: - d[1] = htonl(~0); /* force /32 */ + d[1] = htonl(~0U); /* force /32 */ break; } d[0] &= d[1]; /* mask base address with mask */ |
