diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-07-20 19:03:59 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-07-20 19:25:38 +0000 |
| commit | eb1ccbdccde89701f255f921d88992878057477d (patch) | |
| tree | 5331af5514c565c28ab0bb0e52ba474117536e26 /epan/packet.c | |
| parent | 54812f264b725a8dff73b7801d23a61a12dc3e78 (diff) | |
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>
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/packet.c b/epan/packet.c index e043a0d9bc..83164321fd 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -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) |