diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-04-29 19:04:17 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-04-30 02:04:50 +0000 |
| commit | c34cf306ab90307c23371d638478bce1d348388d (patch) | |
| tree | b2f59efe586f99b9d0fd91f3b925fedf368e1770 /wiretap/network_instruments.c | |
| parent | 44f72a90eaffc8a0322b377c4a66c11bf63340dc (diff) | |
| download | wireshark-c34cf306ab90307c23371d638478bce1d348388d.tar.gz | |
Note some cases where we don't need to check the packet length.
These file formats have 16-bit packet lengths, so, even with some extra
metadata added, the packet data length will never be bigger than
WTAP_MAX_PACKET_SIZE. (No, we won't ever reduce WTAP_MAX_PACKET_SIZE.)
Change-Id: I9e1b1d90971f91cc6e5d66d0aa93841445b2bc22
Reviewed-on: https://code.wireshark.org/review/15186
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/network_instruments.c')
| -rw-r--r-- | wiretap/network_instruments.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 9f2a45accb..286243a312 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -471,6 +471,11 @@ process_packet_header(wtap *wth, packet_entry_header *packet_header, phdr->len = packet_header->network_size - 4; phdr->caplen = MIN(packet_header->captured_size, phdr->len); } + /* + * The maximum value of packet_header->captured_size is 65535, which + * is less than WTAP_MAX_PACKET_SIZE will ever be, so we don't need + * to check it. + */ /* set the wiretap timestamp, assuming for the moment that Observer encoded it in GMT */ phdr->ts.secs = (time_t) ((packet_header->nano_seconds_since_2000 / 1000000000) + ansi_to_observer_epoch_offset); |