diff options
| author | Evan Huus <eapache@gmail.com> | 2013-09-13 17:21:12 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-09-13 17:21:12 +0000 |
| commit | 4fb4b2f1a293ea5b5c6eaeebbf25dfc3b07d504e (patch) | |
| tree | b878607550168031238657da172dfabade692a34 /epan/dissectors/packet-cops.c | |
| parent | 79cd883f02357f63f9402defc5a62f21d13fb534 (diff) | |
Fix a bug (caught by Pascal) where a tree was being explicitly cast to emem_tree
for some reason, and thus the compiler hadn't flagged a type mismatch when the
tree was converted to wmem.
svn path=/trunk/; revision=52010
Diffstat (limited to 'epan/dissectors/packet-cops.c')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index a85585542c..fb4ce57c5a 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1675,7 +1675,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, packet_info *pinfo, guint3 if(*oid_info_p) { if ((*oid_info_p)->kind == OID_KIND_ROW) { - oid_info = (oid_info_t *)emem_tree_lookup32((emem_tree_t *)(*oid_info_p)->children,1); + oid_info = (oid_info_t *)wmem_tree_lookup32((*oid_info_p)->children,1); } else { oid_info = NULL; } @@ -1708,7 +1708,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, packet_info *pinfo, guint3 * -- a lazy lego */ hfid = oid_info->value_hfid; - oid_info = (oid_info_t *)emem_tree_lookup32((emem_tree_t *)(*oid_info_p)->children,oid_info->subid+1); + oid_info = (oid_info_t *)wmem_tree_lookup32((*oid_info_p)->children,oid_info->subid+1); } else hfid = cops_tag_cls2syntax( ber_tag, ber_class ); switch (proto_registrar_get_ftype(hfid)) { |