diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2016-05-09 23:06:28 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-09 23:40:50 +0000 |
| commit | 9a8a454b0a06ffac377663161e272609adc84c46 (patch) | |
| tree | f717f154f80f1bdf7ee93c35ab3c1c82e099a397 /epan | |
| parent | 6febe27586426ac556b56b491a93fed4c852680a (diff) | |
| download | wireshark-9a8a454b0a06ffac377663161e272609adc84c46.tar.gz | |
CID 1215245, 1215247: NULL check for the param of proto_get_id()
Change-Id: Ie1bcbffdc0040bf25e32c763185befb0231f4173
Reviewed-on: https://code.wireshark.org/review/15320
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/packet.c b/epan/packet.c index b44c37074d..d67d8bbbe2 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -2371,8 +2371,8 @@ dissector_try_heuristic(heur_dissector_list_t sub_dissectors, tvbuff_t *tvb, continue; } - proto_id = proto_get_id(hdtbl_entry->protocol); if (hdtbl_entry->protocol != NULL) { + proto_id = proto_get_id(hdtbl_entry->protocol); /* do NOT change this behavior - wslua uses the protocol short name set here in order to determine which Lua-based heurisitc dissector to call */ pinfo->current_proto = |