diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-01-22 00:26:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-01-22 00:26:36 +0000 |
| commit | 90d7c5f59b574e254bc1bb70aaaf12372fe97cc3 (patch) | |
| tree | 7bc8e69b7cc459b8dfef190d1b33a7cb092a7bf3 /wiretap/pcapng.c | |
| parent | 5c825d6a364d83dace7b6c682aa47678e89df79b (diff) | |
| download | wireshark-90d7c5f59b574e254bc1bb70aaaf12372fe97cc3.tar.gz wireshark-90d7c5f59b574e254bc1bb70aaaf12372fe97cc3.tar.bz2 wireshark-90d7c5f59b574e254bc1bb70aaaf12372fe97cc3.zip | |
Don't write out packets that have a "captured length" bigger than we're
willing to read or that's bigger than will fit in the file format;
instead, report an error.
For the "I can't write a packet of that type in that file type" error,
report the file type in question.
svn path=/trunk/; revision=54882
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 86be49d20d..6afc024f7c 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -3253,6 +3253,12 @@ pcapng_write_enhanced_packet_block(wtap_dumper *wdh, guint32 comment_len = 0, comment_pad_len = 0; wtapng_if_descr_t int_data; + /* Don't write anything we're not willing to read. */ + if (phdr->caplen > WTAP_MAX_PACKET_SIZE) { + *err = WTAP_ERR_PACKET_TOO_LARGE; + return FALSE; + } + phdr_len = (guint32)pcap_get_phdr_size(phdr->pkt_encap, pseudo_header); if ((phdr_len + phdr->caplen) % 4) { pad_len = 4 - ((phdr_len + phdr->caplen) % 4); |