osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Michael Mann 2013-05-24 19:23:36 +00:00
parent 71bc722866
commit 586df977d1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/expert.c
View File

@ -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);