diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-10-13 22:23:12 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-10-13 22:23:12 +0000 |
| commit | 0cd5d5857cc5483a2afe13a3c7eb1deb4a975b8b (patch) | |
| tree | 4c51176892eab782708960b2808a97caa451b545 | |
| parent | 6fc2bfe3d626a5688d05415de7e0dba99f75bd46 (diff) | |
| download | wireshark-0cd5d5857cc5483a2afe13a3c7eb1deb4a975b8b.tar.gz | |
Copy over r45525 from trunk with manual intervention:
------------------------------------------------------------------------
r45525 | guy | 2012-10-13 15:20:34 -0700 (Sat, 13 Oct 2012) | 6 lines
The Interface Name field of the Interface Name sub-object of the
Interface Information object for ICMP is *NOT* null-terminated. Use
tvb_format_text() for now, to properly null-terminate the display string
and to cope with non-ASCII data. (It should ultimately be a named field
with an encoding of UTF-8.)
svn path=/trunk-1.8/; revision=45526
| -rw-r--r-- | epan/dissectors/packet-icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index d9b9bcd146..aa99fa4b69 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -779,7 +779,7 @@ dissect_interface_information_object(tvbuff_t *tvb, gint offset, proto_tree *ext { proto_tree_add_text(int_name_object_tree, tvb, offset + 1, int_name_length, "Interface Name: %s", - (const guchar *)tvb_get_ptr(tvb, offset+1, int_name_length)); + tvb_format_text(tvb, offset+1, int_name_length)); } } |