git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2aa9312
)
Fix 'Warn Dissector bug, protocol IAX2, in packet 62: proto.c:4406: failed assertion...
author
Bill Meier
<wmeier@newsguy.com>
Sun, 26 Aug 2012 23:24:27 +0000
(23:24 -0000)
committer
Bill Meier
<wmeier@newsguy.com>
Sun, 26 Aug 2012 23:24:27 +0000
(23:24 -0000)
svn path=/trunk/; revision=44681
epan/dissectors/packet-iax2.c
patch
|
blob
|
history
diff --git
a/epan/dissectors/packet-iax2.c
b/epan/dissectors/packet-iax2.c
index a2180545822061717194185cf56d5bf4a1c4e8e6..29bdc79e649c1ab1e635d0f93076dd16c76e0598 100644
(file)
--- a/
epan/dissectors/packet-iax2.c
+++ b/
epan/dissectors/packet-iax2.c
@@
-2187,7
+2187,7
@@
static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
/* this nargery is to insert the fragment tree into the main tree
* between the IAX protocol entry and the subdissector entry */
show_fragment_tree(fd_head, &iax2_fragment_items, tree, pinfo, next_tvb, &frag_tree_item);
- iax_tree_item = proto_
tree_get_parent( iax2_tree
);
+ iax_tree_item = proto_
item_get_parent( proto_tree_get_parent( iax2_tree )
);
if( frag_tree_item && iax_tree_item )
proto_tree_move_item( tree, iax_tree_item, frag_tree_item );