Wireshark-commits: [Wireshark-commits] rev 42671: /trunk-1.6/ /trunk-1.6/epan/dissectors/: packet-a
Date: Wed, 16 May 2012 23:22:35 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=42671

User: gerald
Date: 2012/05/16 04:22 PM

Log:
 Copy over r42113 and r42115 with manual intervention:
 
   ------------------------------------------------------------------------
   r42113 | etxrab | 2012-04-17 14:00:56 -0700 (Tue, 17 Apr 2012) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-asf.c
 
   From Evan Huus: Break from the loop if the length is zero. Fix  [Bug 7120] ASF infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7120
   ------------------------------------------------------------------------
   r42115 | guy | 2012-04-17 15:36:50 -0700 (Tue, 17 Apr 2012) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-asf.c
 
   Flag too-short TLVs with an expert info item - and treat any TLV length
   less than 4 as "too short", as the TLV length includes the type and
   length fields.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path            Action
  +29 -21    packet-asf.c    Modified

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +1 -0      release-notes.xml    Modified