diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-25 10:44:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-25 17:44:47 +0000 |
| commit | 6d6094e3498254de69f4878502a97b7fa3028207 (patch) | |
| tree | 9c5d4ae7d4fd99b9befa79546cdf2234cfb6bb3f /wiretap/pcapng.c | |
| parent | 83fe3572c5d21b38cebf19ab07b2b10c1fa0816a (diff) | |
Don't fail if a pcap-NG PB or EPB has caplen > actual len.
We don't fail for other file types; there's no point in failing for
pcap-NG. wtap_read() will ensure that caplen <= len.
Make wtap_seek_read() ensure that caplen <= len as well.
Fixes bug 10037.
Change-Id: I41fbcf54341ea0429cef875442ea1f1377177a5f
Reviewed-on: https://code.wireshark.org/review/1353
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index c350532b3f..46662ee988 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -1090,12 +1090,6 @@ pcapng_read_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wta } } - if (packet.cap_len > packet.packet_len) { - *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than packet_len %u", - packet.cap_len, packet.packet_len); - return 0; - } if (packet.cap_len > WTAP_MAX_PACKET_SIZE) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than WTAP_MAX_PACKET_SIZE %u", |