From 586df977d1e616e0768b99f05819a7cdacf0df34 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Fri, 24 May 2013 19:23:36 +0000 Subject: [PATCH] Ensure most severe is displayed in expert column. Bug 7733 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7733) #BACKPORT svn path=/trunk/; revision=49565 --- epan/expert.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epan/expert.c b/epan/expert.c index 0cea1c8afd..901d12cf6a 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -299,7 +299,10 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever expert_set_item_flags(pi, group, severity); } - col_add_str(pinfo->cinfo, COL_EXPERT, val_to_str(severity, expert_severity_vals, "Unknown (%u)")); + if ((pi == NULL) || (PITEM_FINFO(pi) == NULL) || + ((guint)severity >= FI_GET_FLAG(PITEM_FINFO(pi), PI_SEVERITY_MASK))) { + col_add_str(pinfo->cinfo, COL_EXPERT, val_to_str(severity, expert_severity_vals, "Unknown (%u)")); + } if (use_vaformat) { g_vsnprintf(formatted, ITEM_LABEL_LENGTH, format, ap);