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/libpcap.c | |
| parent | 5c825d6a364d83dace7b6c682aa47678e89df79b (diff) | |
| download | wireshark-90d7c5f59b574e254bc1bb70aaaf12372fe97cc3.tar.gz | |
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/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index c73a357835..a323cde1b3 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -935,6 +935,12 @@ static gboolean libpcap_dump(wtap_dumper *wdh, phdrsize = pcap_get_phdr_size(wdh->encap, pseudo_header); + /* Don't write anything we're not willing to read. */ + if (phdr->caplen + phdrsize > WTAP_MAX_PACKET_SIZE) { + *err = WTAP_ERR_PACKET_TOO_LARGE; + return FALSE; + } + rec_hdr.hdr.ts_sec = (guint32) phdr->ts.secs; if(wdh->tsprecision == WTAP_FILE_TSPREC_NSEC) { rec_hdr.hdr.ts_usec = phdr->ts.nsecs; |