diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-05-24 19:23:36 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-05-24 19:23:36 +0000 |
| commit | 586df977d1e616e0768b99f05819a7cdacf0df34 (patch) | |
| tree | aeba777e140f46509b1b4e560833bfc93083c3e0 /epan/expert.c | |
| parent | 71bc7228668970af1cc09660c8cb850dcd882e45 (diff) | |
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
Diffstat (limited to 'epan/expert.c')
| -rw-r--r-- | epan/expert.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); |