aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2015-11-04 23:48:59 +0100
committerMichael Mann <mmann78@netscape.net>2015-11-05 02:53:41 +0000
commit51dcd59d2d89da2aae6dc5bd028c98e41575623f (patch)
tree772b2ce60bef049409e64d14e3a45489b99bb6f5
parentea0e29f3e6c7dd863020e80b4b52fe1519f49930 (diff)
packet-dcerpc: let dcerpc_get_proto_name() handle unknown uuids
This fixes a regression in commit e0e574d16748313dd8903f886d1af9eb0821fee7. Change-Id: I447001a84e17a76ec77c48f736bbfcd8cc6324a1 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/11574 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-dcerpc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 149e378c52..c6cbdc5de4 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -1577,12 +1577,18 @@ dcerpc_init_uuid(int proto, int ett, e_guid_t *uuid, guint16 ver,
const char *
dcerpc_get_proto_name(e_guid_t *uuid, guint16 ver)
{
+ dissector_handle_t handle;
guid_key key;
key.guid = *uuid;
key.ver = ver;
- return dissector_handle_get_short_name(dissector_get_guid_handle(uuid_dissector_table, &key));
+ handle = dissector_get_guid_handle(uuid_dissector_table, &key);
+ if (handle == NULL) {
+ return NULL;
+ }
+
+ return dissector_handle_get_short_name(handle);
}
/* Function to find the opnum hf-field of a registered protocol