Wireshark · Wireshark-commits: [Wireshark-commits] rev 41143: /trunk/wiretap/ /trunk/wiretap/: pcapng.c

[guy@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=41143

User: guy
Date: 2012/02/22 10:32 AM

Log:
 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/wiretap/
  Changes    Path          Action
  +240 -43   pcapng.c      Modified