diff options
| author | Evan Huus <eapache@gmail.com> | 2013-09-12 12:37:27 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-09-12 12:37:27 +0000 |
| commit | 58a9f5cb1ef9e40b6948edff08f6d172ae7d1ed1 (patch) | |
| tree | d3745e1de53bd4d9402b2ecdfd4ba13da0e46e1c /epan/dissectors/packet-opensafety.c | |
| parent | 343772cbcf9ced336d40a6ad1886c93199ed9775 (diff) | |
| download | wireshark-58a9f5cb1ef9e40b6948edff08f6d172ae7d1ed1.tar.gz | |
More wmem.
svn path=/trunk/; revision=51968
Diffstat (limited to 'epan/dissectors/packet-opensafety.c')
| -rw-r--r-- | epan/dissectors/packet-opensafety.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index c05692ab45..4cee573cc7 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -44,7 +44,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> -#include <epan/emem.h> #include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/reassemble.h> @@ -1502,11 +1501,11 @@ dissect_opensafety_snmt_message(tvbuff_t *message_tvb, packet_info *pinfo , prot if ( global_scm_udid_autoset == TRUE ) { - tempString = (char *)ep_alloc0(128 * sizeof(char)); + tempString = (char *)wmem_alloc0(wmem_packet_scope(), 128 * sizeof(char)); g_snprintf ( tempString, 18, "%s", tvb_bytes_to_str_punct(message_tvb, OSS_FRAME_POS_DATA + frameStart1 + 1, 6, ':' ) ); if ( memcmp ( global_scm_udid, tempString, 17 ) != 0 ) { - local_scm_udid = (char *)se_alloc0(18 * sizeof(char)); + local_scm_udid = (char *)wmem_alloc0(wmem_file_scope(), 18 * sizeof(char)); g_snprintf(local_scm_udid, 18, "%s", tempString ); expert_add_info_format(pinfo, item, &ei_scmudid_autodetected, "Auto detected payload as SCM UDID [%s].", tempString); } @@ -1533,11 +1532,11 @@ dissect_opensafety_snmt_message(tvbuff_t *message_tvb, packet_info *pinfo , prot if ( global_scm_udid_autoset == TRUE ) { - tempString = (char *)ep_alloc0(18 * sizeof(char)); + tempString = (char *)wmem_alloc0(wmem_packet_scope(), 18 * sizeof(char)); g_snprintf ( tempString, 18, "%s", tvb_bytes_to_str_punct(message_tvb, OSS_FRAME_POS_DATA + frameStart1 + 1, 6, ':' ) ); if ( memcmp ( global_scm_udid, tempString, 17 ) != 0 ) { - local_scm_udid = (char *)se_alloc0(18 * sizeof(char)); + local_scm_udid = (char *)wmem_alloc0(wmem_file_scope(), 18 * sizeof(char)); g_snprintf(local_scm_udid, 18, "%s", tempString ); expert_add_info_format(pinfo, item, &ei_scmudid_autodetected, "Auto detected payload as SCM UDID [%s].", tempString); } |