diff options
author | Michael Tüxen <tuexen@wireshark.org> | 2014-07-17 20:50:59 +0200 |
---|---|---|
committer | Michael Tüxen <tuexen@wireshark.org> | 2014-07-17 23:47:03 +0000 |
commit | 3e7ed3da2c8311a3af83ab5bb84311486ee115fa (patch) | |
tree | bb5a5ea18566fd575d09dc7d49dc778a41a4999e /epan/dissectors/packet-m2ua.c | |
parent | e05a884740c52597a9cd93107ee2eb05a3d1f75c (diff) |
Escape some characters like \n when appending text
This patch escapes some characters like \n when showing text
contained in a packet by appending it to a protocol item.
Change-Id: Ice0040040ec7ab573dd9a412f8c0c197a566a031
Reviewed-on: https://code.wireshark.org/review/3095
Petri-Dish: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-m2ua.c')
-rw-r--r-- | epan/dissectors/packet-m2ua.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 2c95c7b95e..719f42f0b7 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -286,7 +286,7 @@ dissect_interface_identifier_text_parameter(tvbuff_t *parameter_tvb, proto_tree proto_tree_add_item(parameter_tree, hf_interface_id_text, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, - tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII)); + tvb_format_text(parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); } #define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET @@ -299,7 +299,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, - tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII)); + tvb_format_text(parameter_tvb, INFO_STRING_OFFSET, info_string_length)); } #define DIAGNOSTIC_INFO_OFFSET PARAMETER_VALUE_OFFSET |