diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-02-04 12:16:26 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-02-04 12:16:26 +0000 |
| commit | 70ef78fbc045b0fb0f2db77d2c5fa0ae16fd2956 (patch) | |
| tree | 0ee403a78efd905243e7b2c838647e69db728834 /epan/proto.c | |
| parent | 033840fb254c1480487f5bebbd0bb81d7e0afcec (diff) | |
Fix Bug 5500 - failed assertion in ISAKMP dissector (proto.c:4002)
By reinseringt the check in proto_tree_move_item() if tree vissible
removed in http://anonsvn.wireshark.org/viewvc?view=rev&revision=32443
Hopefully not breaking tshark again.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5500
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35817 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/proto.c b/epan/proto.c index c2bdaf5d9c..40d280a8c1 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -3999,6 +3999,15 @@ void proto_tree_move_item(proto_tree *tree, proto_item *fixed_item, proto_item *item_to_move) { + + /* Revert part of: http://anonsvn.wireshark.org/viewvc?view=rev&revision=32443 + * See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5500 + */ + /* This function doesn't generate any values. It only reorganizes the prococol tree + * so we can bail out immediately if it isn't visible. */ + if (!tree || !PTREE_DATA(tree)->visible) + return; + DISSECTOR_ASSERT(item_to_move->parent == tree); DISSECTOR_ASSERT(fixed_item->parent == tree); |