aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2011-06-09 18:31:39 +0000
committerGerald Combs <gerald@wireshark.org>2011-06-09 18:31:39 +0000
commit04f147f4fa268e5277899d4c133cbfac124aa4c1 (patch)
treefa19093315f6877936d013c783ba902b4aadfaef /wiretap
parent90e539b55f72ae42a753b008220086aa69c22087 (diff)
Make sure we don't write invalid record lengths.
svn path=/trunk/; revision=37634
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/libpcap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 4557839b89..bb232b5fd2 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -997,6 +997,12 @@ static gboolean libpcap_dump(wtap_dumper *wdh,
}
rec_hdr.hdr.incl_len = phdr->caplen + phdrsize;
rec_hdr.hdr.orig_len = phdr->len + phdrsize;
+
+ if (rec_hdr.hdr.incl_len > WTAP_MAX_PACKET_SIZE || rec_hdr.hdr.orig_len > WTAP_MAX_PACKET_SIZE) {
+ *err = WTAP_ERR_BAD_RECORD;
+ return FALSE;
+ }
+
switch (wdh->file_type) {
case WTAP_FILE_PCAP: