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

Protect dissector_get_(default_)string_handle() against NULL input string 

Bug: 11381
Change-Id: Ib102a23b3d840144757ce692312ff13009c5c95e
Reviewed-on: https://code.wireshark.org/review/9717
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2015-07-20 19:03:59 +02:00
parent 54812f264b
commit eb1ccbdccd
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/packet.c
View File

@ -1459,6 +1459,7 @@ dissector_get_string_handle(dissector_table_t sub_dissectors,
{
dtbl_entry_t *dtbl_entry;
if (!string) return 0;
dtbl_entry = find_string_dtbl_entry(sub_dissectors, string);
if (dtbl_entry != NULL)
return dtbl_entry->current;
@ -1469,8 +1470,10 @@ dissector_get_string_handle(dissector_table_t sub_dissectors,
dissector_handle_t
dissector_get_default_string_handle(const char *name, const gchar *string)
{
dissector_table_t sub_dissectors = find_dissector_table(name);
dissector_table_t sub_dissectors;
if (!string) return 0;
sub_dissectors = find_dissector_table(name);
if (sub_dissectors != NULL) {
dtbl_entry_t *dtbl_entry = find_string_dtbl_entry(sub_dissectors, string);
if (dtbl_entry != NULL)