From 4ed81928b8db1582cfaf82a6eb366c450ad6aa55 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Wed, 6 Mar 2013 12:39:35 +0000 Subject: [PATCH 10/10] Manually backport more of r48011. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8441 for 1.8 branch. svn path=/trunk-1.8/; revision=48132 --- epan/dissectors/packet-frame.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 2ab1b67..00922f3 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -541,6 +541,23 @@ show_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissector_error_nomsg : exception_message); break; + case ReassemblyError: + col_append_fstr(pinfo->cinfo, COL_INFO, + "[Reassembly error, protocol %s: %s]", + pinfo->current_proto, + exception_message == NULL ? + dissector_error_nomsg : exception_message); + item = proto_tree_add_protocol_format(tree, proto_malformed, tvb, 0, 0, + "[Reassembly error, protocol %s: %s]", + pinfo->current_proto, + exception_message == NULL ? + dissector_error_nomsg : exception_message); + expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, + "%s", + exception_message == NULL ? + dissector_error_nomsg : exception_message); + break; + default: /* XXX - we want to know, if an unknown exception passed until here, don't we? */ g_assert_not_reached(); -- 1.7.10.4