summaryrefslogtreecommitdiff
path: root/epan/asn1.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-10 19:04:06 -0500
committerMichael Mann <mmann78@netscape.net>2015-01-11 00:27:57 +0000
commitf5c4d06dbaf2c8468588e0b35e386045c1107ea4 (patch)
tree8806d34bf32d34bc7c14c53cbdcd9d0720ac05b1 /epan/asn1.c
parentfdd6554ccd1b01554865323045033db9ca858f97 (diff)
downloadwireshark-f5c4d06dbaf2c8468588e0b35e386045c1107ea4.tar.gz
Replace some "low hanging fruit" uses of emem.
Most of the remaining ep_ uses are grouped with specific functionality. Change-Id: I8fa64a17acc6bcdcf6891b2d28715ac0c58f1a4a Reviewed-on: https://code.wireshark.org/review/6484 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/asn1.c')
-rw-r--r--epan/asn1.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/asn1.c b/epan/asn1.c
index b878c719b8..ea43f7001a 100644
--- a/epan/asn1.c
+++ b/epan/asn1.c
@@ -64,7 +64,7 @@ void asn1_ctx_clean_epdv(asn1_ctx_t *actx) {
void asn1_stack_frame_push(asn1_ctx_t *actx, const gchar *name) {
asn1_stack_frame_t *frame;
- frame = ep_new0(asn1_stack_frame_t);
+ frame = wmem_new0(wmem_packet_scope(), asn1_stack_frame_t);
frame->name = name;
frame->next = actx->stack;
actx->stack = frame;
@@ -112,7 +112,7 @@ static asn1_par_t *push_new_par(asn1_ctx_t *actx) {
DISSECTOR_ASSERT(actx->stack);
- par = ep_new0(asn1_par_t);
+ par = wmem_new0(wmem_packet_scope(), asn1_par_t);
pp = &(actx->stack->par);
while (*pp)
@@ -278,8 +278,9 @@ double asn1_get_real(const guint8 *real_ptr, gint len) {
case 0x01: val = -HUGE_VAL; break;
}
} else { /* decimal encoding */
- buf = ep_strndup(p, len);
+ buf = g_strndup(p, len);
val = atof(buf);
+ g_free(buf);
}
return val;