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-cops.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-cops.c')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index b34a09d3fe..2d619c678e 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1579,7 +1579,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, packet_info *pinfo, guint3 encoid_len = tvb_length_remaining(oid_tvb,0); if (encoid_len > 0) { encoid = (guint8*)tvb_memdup(wmem_packet_scope(),oid_tvb,0,encoid_len); - (*pprid_subids_len) = oid_encoded2subid(encoid, encoid_len, pprid_subids); + (*pprid_subids_len) = oid_encoded2subid(wmem_packet_scope(), encoid, encoid_len, pprid_subids); } } break; @@ -1610,9 +1610,9 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, packet_info *pinfo, guint3 if (*pprid_subids) { /* Never tested this branch */ subids_len = redecode_oid(*pprid_subids, *pprid_subids_len, encoid, encoid_len, &subids); - encoid_len = oid_subid2encoded(subids_len, subids, &encoid); + encoid_len = oid_subid2encoded(wmem_packet_scope(), subids_len, subids, &encoid); } else { - subids_len = oid_encoded2subid(encoid, encoid_len, &subids); + subids_len = oid_encoded2subid(wmem_packet_scope(), encoid, encoid_len, &subids); } proto_tree_add_oid(asn_tree,hf_cops_prid_oid,tvb,offset,encoid_len,encoid); |