diff options
| author | Dario Lombardo <lomato@gmail.com> | 2017-02-01 15:34:15 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-02-01 16:14:13 +0000 |
| commit | 226377fa8c39496b2e5cb2f9e7b6642cb61dc706 (patch) | |
| tree | 3f4453cd8319651f480e7b412ced4716e78ae590 | |
| parent | 96b8da738d497c1eaea98762aca277a3f3493851 (diff) | |
h460: use wmem for strdup.
Change-Id: Iac6027e4b1449a77bc6b0a3d089634a296b8e802
Reviewed-on: https://code.wireshark.org/review/19904
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/asn1/h460/packet-h460-template.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-h460.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/asn1/h460/packet-h460-template.c b/epan/dissectors/asn1/h460/packet-h460-template.c index 944bc326b1..ace3110989 100644 --- a/epan/dissectors/asn1/h460/packet-h460-template.c +++ b/epan/dissectors/asn1/h460/packet-h460-template.c @@ -260,10 +260,10 @@ void proto_register_h460(void) { proto_register_subtree_array(ett, array_length(ett)); for (ftr=h460_feature_tab; ftr->id; ftr++) { - if (ftr->opt & GD) ftr->key_gd = g_strdup_printf("GenericData/%s", ftr->id); - if (ftr->opt & FD) ftr->key_fd = g_strdup_printf("FeatureDescriptor/%s", ftr->id); - if (ftr->opt & GM) ftr->key_gm = g_strdup_printf("GenericMessage/%s", ftr->id); - if (ftr->opt & GI) ftr->key_gi = g_strdup_printf("GenericInformation/%s", ftr->id); + if (ftr->opt & GD) ftr->key_gd = wmem_strdup_printf(wmem_epan_scope(), "GenericData/%s", ftr->id); + if (ftr->opt & FD) ftr->key_fd = wmem_strdup_printf(wmem_epan_scope(), "FeatureDescriptor/%s", ftr->id); + if (ftr->opt & GM) ftr->key_gm = wmem_strdup_printf(wmem_epan_scope(), "GenericMessage/%s", ftr->id); + if (ftr->opt & GI) ftr->key_gi = wmem_strdup_printf(wmem_epan_scope(), "GenericInformation/%s", ftr->id); if (ftr->content_pdu) ftr->content_hnd = create_dissector_handle(ftr->content_pdu, proto_h460); } } diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 976da85af1..0e78949c42 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -2981,10 +2981,10 @@ void proto_register_h460(void) { proto_register_subtree_array(ett, array_length(ett)); for (ftr=h460_feature_tab; ftr->id; ftr++) { - if (ftr->opt & GD) ftr->key_gd = g_strdup_printf("GenericData/%s", ftr->id); - if (ftr->opt & FD) ftr->key_fd = g_strdup_printf("FeatureDescriptor/%s", ftr->id); - if (ftr->opt & GM) ftr->key_gm = g_strdup_printf("GenericMessage/%s", ftr->id); - if (ftr->opt & GI) ftr->key_gi = g_strdup_printf("GenericInformation/%s", ftr->id); + if (ftr->opt & GD) ftr->key_gd = wmem_strdup_printf(wmem_epan_scope(), "GenericData/%s", ftr->id); + if (ftr->opt & FD) ftr->key_fd = wmem_strdup_printf(wmem_epan_scope(), "FeatureDescriptor/%s", ftr->id); + if (ftr->opt & GM) ftr->key_gm = wmem_strdup_printf(wmem_epan_scope(), "GenericMessage/%s", ftr->id); + if (ftr->opt & GI) ftr->key_gi = wmem_strdup_printf(wmem_epan_scope(), "GenericInformation/%s", ftr->id); if (ftr->content_pdu) ftr->content_hnd = create_dissector_handle(ftr->content_pdu, proto_h460); } } |