Wireshark-commits: [Wireshark-commits] rev 43260: /trunk-1.6/epan/ /trunk-1.6/epan/: proto.c

Date: Thu, 14 Jun 2012 18:20:14 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43260

User: wmeier
Date: 2012/06/14 11:20 AM

Log:
 Copy SVN #43150, #43184, #43186 (with some manual intervention) to 1.6 branch
 
 ------------------------------------------------------------------------
 r43150 | wmeier | 2012-06-07 17:10:02 -0400 (Thu, 07 Jun 2012) | 11 lines
 
 Don't crash in 'proto_registrar_dump_values' if BASE_EXT_STRING and no extended string.
 Note: this shows up when doing 'tshark -G values'.
 
 BASE_EXT_STRING with a missing extended string does *not* cause issues
 with the normal display code:
 
 ToDo (eventually): Add some code to enforce requirement that hf[] entries with BASE_EXT_STRING
 (or BASE_RANGE_STRING) set must also have a 'strings' value.
 
 
 
 ------------------------------------------------------------------------
 r43184 | wmeier | 2012-06-10 11:10:11 -0400 (Sun, 10 Jun 2012) | 5 lines
 
 Fix bug wherein values in a custom column aren't displayed as a value_string (when appropriate).
 Essentially: BASE_CUSTOM is "base_display_e value" (like BASE_DEC) *not* a bit-mask
  (like BASE_EXT_STRING).
 Bug introduced in SVN #39902
 
 ------------------------------------------------------------------------
 r43186 | wmeier | 2012-06-10 15:23:50 -0400 (Sun, 10 Jun 2012) | 3 lines
 
 Fix "BASE_CUSTOM field is incorrectly formatted when applied as a column".
 Resolves Bug #6671 - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6671
 
 ------------------------------------------------------------------------

Directory: /trunk-1.6/epan/
  Changes    Path          Action
  +40 -28    proto.c       Modified