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

Fix crash in internals menu dissector tables dialog by supporting FT_GUID type. 

Change-Id: I1e4700b505746c49ea518dc401be590740720a57
Reviewed-on: https://code.wireshark.org/review/11600
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2015-11-06 10:07:49 -05:00
parent fdeab5a22f
commit 1799834898
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/gtk/dissector_tables_dlg.c
View File

@ -152,7 +152,13 @@ decode_proto_add_to_list (const gchar *table_name _U_, ftenum_t selector_type,
break;
case FT_BYTES:
proto_add_to_list(tree_info, store, (gchar*)dissector_handle_get_dissector_name(handle), proto_name);
case FT_GUID:
str = (gchar*)dissector_handle_get_dissector_name(handle);
if (str == NULL)
{
str = (gchar*)"<Unknown>";
}
proto_add_to_list(tree_info, store, str, proto_name);
break;
default:
@ -239,6 +245,7 @@ display_dissector_table_names(const char *table_name, const char *ui_name, void
table_name_add_to_list(tree_info, dis_tbl_trees->str_tree_wgt, table_name, ui_name);
break;
case FT_BYTES:
case FT_GUID:
table_name_add_to_list(tree_info, dis_tbl_trees->custom_tree_wgt, table_name, ui_name);
break;
default: