mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-23 09:10:43 +00:00
net/libpcap: Update to 1.10.0
Sponsored by: Rubicon Communications, LLC (Netgate)
This commit is contained in:
parent
2f61097a83
commit
bfadc03056
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=560524
net/libpcap
@ -2,8 +2,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= libpcap
|
PORTNAME= libpcap
|
||||||
PORTVERSION= 1.9.1
|
PORTVERSION= 1.10.0
|
||||||
PORTREVISION= 1
|
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
MASTER_SITES= http://www.tcpdump.org/release/
|
MASTER_SITES= http://www.tcpdump.org/release/
|
||||||
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
TIMESTAMP = 1570016067
|
TIMESTAMP = 1609875800
|
||||||
SHA256 (libpcap-1.9.1.tar.gz) = 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
|
SHA256 (libpcap-1.10.0.tar.gz) = 8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e
|
||||||
SIZE (libpcap-1.9.1.tar.gz) = 861228
|
SIZE (libpcap-1.10.0.tar.gz) = 934559
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
diff --git a/gencode.c b/gencode.c
|
|
||||||
index bdc35e64..040a5531 100644
|
|
||||||
--- gencode.c
|
|
||||||
+++ gencode.c
|
|
||||||
@@ -6947,11 +6947,15 @@ gen_mcode(compiler_state_t *cstate, const char *s1, const char *s2,
|
|
||||||
return (NULL);
|
|
||||||
|
|
||||||
nlen = __pcap_atoin(s1, &n);
|
|
||||||
+ if (nlen < 0)
|
|
||||||
+ bpf_error(cstate, "invalid IPv4 address '%s'", s1);
|
|
||||||
/* Promote short ipaddr */
|
|
||||||
n <<= 32 - nlen;
|
|
||||||
|
|
||||||
if (s2 != NULL) {
|
|
||||||
mlen = __pcap_atoin(s2, &m);
|
|
||||||
+ if (mlen < 0)
|
|
||||||
+ bpf_error(cstate, "invalid IPv4 address '%s'", s2);
|
|
||||||
/* Promote short ipaddr */
|
|
||||||
m <<= 32 - mlen;
|
|
||||||
if ((n & ~m) != 0)
|
|
||||||
@@ -7009,8 +7013,11 @@ gen_ncode(compiler_state_t *cstate, const char *s, bpf_u_int32 v, struct qual q)
|
|
||||||
vlen = __pcap_atodn(s, &v);
|
|
||||||
if (vlen == 0)
|
|
||||||
bpf_error(cstate, "malformed decnet address '%s'", s);
|
|
||||||
- } else
|
|
||||||
+ } else {
|
|
||||||
vlen = __pcap_atoin(s, &v);
|
|
||||||
+ if (vlen < 0)
|
|
||||||
+ bpf_error(cstate, "invalid IPv4 address '%s'", s);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
switch (q.addr) {
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
|||||||
diff --git a/nametoaddr.c b/nametoaddr.c
|
|
||||||
index 53070a28..13bf4c68 100644
|
|
||||||
--- nametoaddr.c
|
|
||||||
+++ nametoaddr.c
|
|
||||||
@@ -674,8 +674,15 @@ __pcap_atoin(const char *s, bpf_u_int32 *addr)
|
|
||||||
len = 0;
|
|
||||||
for (;;) {
|
|
||||||
n = 0;
|
|
||||||
- while (*s && *s != '.')
|
|
||||||
+ while (*s && *s != '.') {
|
|
||||||
+ if (n > 25) {
|
|
||||||
+ /* The result will be > 255 */
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
n = n * 10 + *s++ - '0';
|
|
||||||
+ }
|
|
||||||
+ if (n > 255)
|
|
||||||
+ return -1;
|
|
||||||
*addr <<= 8;
|
|
||||||
*addr |= n & 0xff;
|
|
||||||
len += 8;
|
|
@ -47,6 +47,7 @@ man/man3/pcap_get_required_select_timeout.3.gz
|
|||||||
man/man3/pcap_get_selectable_fd.3.gz
|
man/man3/pcap_get_selectable_fd.3.gz
|
||||||
man/man3/pcap_get_tstamp_precision.3.gz
|
man/man3/pcap_get_tstamp_precision.3.gz
|
||||||
man/man3/pcap_geterr.3.gz
|
man/man3/pcap_geterr.3.gz
|
||||||
|
man/man3/pcap_init.3.gz
|
||||||
man/man3/pcap_inject.3.gz
|
man/man3/pcap_inject.3.gz
|
||||||
man/man3/pcap_is_swapped.3.gz
|
man/man3/pcap_is_swapped.3.gz
|
||||||
man/man3/pcap_lib_version.3.gz
|
man/man3/pcap_lib_version.3.gz
|
||||||
|
Loading…
Reference in New Issue
Block a user