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/netmon.c | |
| parent | 5c825d6a364d83dace7b6c682aa47678e89df79b (diff) | |
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/netmon.c')
| -rw-r--r-- | wiretap/netmon.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index ad1aacb8f6..717992a738 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -1027,6 +1027,34 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, gint64 secs; gint32 nsecs; + switch (wdh->file_type_subtype) { + + case WTAP_FILE_TYPE_SUBTYPE_NETMON_1_x: + /* + * The length fields are 16-bit, so there's a hard limit + * of 65535. + */ + if (phdr->caplen > 65535) { + *err = WTAP_ERR_PACKET_TOO_LARGE; + return FALSE; + } + break; + + case WTAP_FILE_TYPE_SUBTYPE_NETMON_2_x: + /* 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; + } + break; + + default: + /* We should never get here - our open routine + should only get called for the types above. */ + *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE; + return FALSE; + } + if (wdh->encap == WTAP_ENCAP_PER_PACKET) { /* * Is this network type supported? |