Wireshark-commits: [Wireshark-commits] rev 41153: /trunk-1.6/wiretap/ /trunk-1.6/wiretap/: pcapng.c
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=41153
User: guy
Date: 2012/02/23 02:12 AM
Log:
Copy over revisions from the trunk, with manual intervention:
------------------------------------------------------------------------
r41152 | guy | 2012-02-23 02:03:16 -0800 (Thu, 23 Feb 2012) | 10 lines
Do a check of the block total length in pcapng_read_unknown_block().
That means we don't need to do the block length check in
pcapng_read_block(); each block type reader, including the one for
unknown block types, does a check that's as stringent as that block
length check or more stringent, which means any block whose length is
less than the minimum will fail with the same error in both cases.
Fix the message for a too-short NRB.
------------------------------------------------------------------------
r41145 | guy | 2012-02-22 15:44:25 -0800 (Wed, 22 Feb 2012) | 2 lines
Fix typo introduced by previous checkin.
------------------------------------------------------------------------
r41143 | guy | 2012-02-22 10:32:43 -0800 (Wed, 22 Feb 2012) | 16 lines
Add sanity checks to make sure the claimed block size is big enough to:
1) contain the block length fields and block type field;
2) contain that plus the fixed-length portion of the block;
3) for blocks that have a variable-length portion other than the
options, contain that variable-length portion.
Fixes a crash we're seeing with a bad pcap-NG file in the Wireshark
menagerie (7799-lastPacketWithoutComment.pcapng - the last packet's
block length is 128, but it claims to have 98 bytes of packet data,
which requires a 132-byte block).
Clean up white space (use 8-space tabs).
Directory: /trunk-1.6/wiretap/
Changes Path Action
+235 -44 pcapng.c Modified
