diff options
author | Michael Mann <mmann78@netscape.net> | 2015-01-17 14:11:29 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-01-19 02:52:11 +0000 |
commit | e333e4c90f0aca41b0a56cef22fd80d0b0e73e14 (patch) | |
tree | 0d90a0e8561d6e4cf1361d56629e649af655d40d /epan/dissectors/packet-x509if.c | |
parent | 59155d1d1c40a979d5f5040e4df35ee72dadbb9c (diff) |
Convert OID APIs to use wmem.
There are a few oid functions that are only called in oids_test.c. I'll presume the APIs are used in proprietary dissectors rather than just remove them.
Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f
Reviewed-on: https://code.wireshark.org/review/6592
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-x509if.c')
-rw-r--r-- | epan/dissectors/packet-x509if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index c4e727342c..1d51148173 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -728,7 +728,7 @@ dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse if(actx->external.direct_reference) { /* see if we can find a nice name */ - name = oid_resolved_from_string(actx->external.direct_reference); + name = oid_resolved_from_string(wmem_packet_scope(), actx->external.direct_reference); if(!name) name = actx->external.direct_reference; if(last_rdn) { /* append it to the RDN */ @@ -801,7 +801,7 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o last_ava = (char *)wmem_alloc(wmem_packet_scope(), MAX_AVA_STR_LEN); } - if(!(name = oid_resolved_from_string(actx->external.direct_reference))) + if(!(name = oid_resolved_from_string(wmem_packet_scope(), actx->external.direct_reference))) name = actx->external.direct_reference; g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s %s", name, fmt, value); |