The stuff you get from dissect_cbs_data() is UTF-8 encoded; treat it as

such.

Replace proto_tree_add_string(..., tvb_get_string_enc(same ...,
ENC_xxx)) with proto_tree_add_item(..., ENC_xxx).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54895 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c
index 59c09ed0d364f6bb7da32f5f95d1c47fa87a0709..a1a3cf7857cfda34d8bf07ab79adfa2d6773d86e 100644 (file)
--- a/asn1/sabp/packet-sabp-template.c
+++ b/asn1/sabp/packet-sabp-template.c
@@ -158,7 +158,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                if (unpacked_tvb != NULL){
                        if (tree != NULL){
                                proto_tree *cbs_page_subtree = proto_item_add_subtree(cbs_page_item, ett_sabp_cbs_page_content);
-                               proto_tree_add_string(cbs_page_subtree, hf_sabp_cbs_page_content, unpacked_tvb, 0, len, tvb_get_string(wmem_packet_scope(), unpacked_tvb, 0, len));
+                               proto_tree_add_item(cbs_page_subtree, hf_sabp_cbs_page_content, unpacked_tvb, 0, len, ENC_UTF_8|ENC_NA);
                        }
                }
 

diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index 6f0ded91a77e071d10d4366496e3cc3f7d865d48..bb0b765c65da90cefca512f10c9cf11a3985253d 100644 (file)
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -1795,7 +1795,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                if (unpacked_tvb != NULL){
                        if (tree != NULL){
                                proto_tree *cbs_page_subtree = proto_item_add_subtree(cbs_page_item, ett_sabp_cbs_page_content);
-                               proto_tree_add_string(cbs_page_subtree, hf_sabp_cbs_page_content, unpacked_tvb, 0, len, tvb_get_string(wmem_packet_scope(), unpacked_tvb, 0, len));
+                               proto_tree_add_item(cbs_page_subtree, hf_sabp_cbs_page_content, unpacked_tvb, 0, len, ENC_UTF_8|ENC_NA);
                        }
                }