aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_sms.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-08-30 14:49:55 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-08-30 14:49:55 +0000
commit84bf0acc0035cb284e8afcfb51ac7171eafc25ef (patch)
treed467f44d9e8986593c53be452b53bc5f878971d8 /epan/dissectors/packet-gsm_sms.c
parentac5619426a416f523bd193413f43c3360b37bd9c (diff)
Convert a few dissectors from EMEM to WMEM API
svn path=/trunk/; revision=51597
Diffstat (limited to 'epan/dissectors/packet-gsm_sms.c')
-rw-r--r--epan/dissectors/packet-gsm_sms.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index b14b2516da..300a0db974 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -44,6 +44,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/reassemble.h>
+#include <epan/wmem/wmem.h>
#include "packet-gsm_sms.h"
@@ -440,7 +441,7 @@ dis_field_addr(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, const gchar *
addrstr = gsm_sms_chars_to_utf8(addrbuf, i);
break;
default:
- addrstr = (gchar *)ep_alloc(numdigocts*2 + 1);
+ addrstr = (gchar *)wmem_alloc(wmem_packet_scope(), numdigocts*2 + 1);
for (i = 0; i < numdigocts; i++)
{
oct = tvb_get_guint8(tvb, offset + i);
@@ -1749,7 +1750,7 @@ gsm_sms_chars_to_utf8(const unsigned char* src, int len)
}
/* Now allocate a buffer for the output string and fill it in */
- outbuf = (gchar *)ep_alloc(outlen + 1);
+ outbuf = (gchar *)wmem_alloc(wmem_packet_scope(), outlen + 1);
for (i = 0, j = 0; j < len; j++)
{
if (char_is_escape(src[j])) {