diff options
| author | Xin LI <delphij@FreeBSD.org> | 2012-05-14 05:12:56 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2012-05-14 05:12:56 +0000 |
| commit | d1e8733132ce92d068898e4b3fe25ce17d634590 (patch) | |
| tree | 158e6045ed438c41ac8de6cb27ac3c73cdc6643a /contrib/libpcap/sf-pcap.c | |
| parent | 47db53c31a5ec643382c4b08c3f68dd4ccdf79d9 (diff) | |
| parent | 5a0615f5c40ce036a7e13cfffe00927f845ad563 (diff) | |
| download | src-d1e8733132ce92d068898e4b3fe25ce17d634590.tar.gz src-d1e8733132ce92d068898e4b3fe25ce17d634590.zip | |
Merge from vendor branch: update libpcap to 1.2.1.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=235426
Diffstat (limited to 'contrib/libpcap/sf-pcap.c')
| -rw-r--r-- | contrib/libpcap/sf-pcap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/libpcap/sf-pcap.c b/contrib/libpcap/sf-pcap.c index 9d55dae5fbe9..2b31a2b7a0f1 100644 --- a/contrib/libpcap/sf-pcap.c +++ b/contrib/libpcap/sf-pcap.c @@ -271,8 +271,12 @@ pcap_check_header(pcap_t *p, bpf_u_int32 magic, FILE *fp, char *errbuf) * Allocate a buffer for the packet data. */ p->bufsize = p->snapshot; - if (p->bufsize <= 0) - p->bufsize = BPF_MAXBUFSIZE; + if (p->bufsize <= 0) { + /* + * Bogus snapshot length; use 64KiB as a fallback. + */ + p->bufsize = 65536; + } p->buffer = malloc(p->bufsize); if (p->buffer == NULL) { snprintf(errbuf, PCAP_ERRBUF_SIZE, "out of memory"); |