summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ldap.c2
-rw-r--r--epan/oids.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index b8c58ef7dd..5790f530dc 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -2889,7 +2889,7 @@ dissect_ldap_T_intermediateResponse_responseValue(gboolean implicit_tag _U_, tvb
#line 757 "ldap.cnf"
- if(ldm_tree) {
+ if(ldm_tree && object_identifier_id) {
proto_item_set_text(ldm_tree, "%s %s", "IntermediateResponse", object_identifier_id);
name = oid_resolved_from_string(object_identifier_id);
if(name)
diff --git a/epan/oids.c b/epan/oids.c
index a5514fc56e..d59a73aa3e 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -746,7 +746,7 @@ guint check_num_oid(const char* str) {
guint n = 0;
D(8,("check_num_oid: '%s'",str));
- if (*r == '.' || *r == '\0') return 0;
+ if (!r || *r == '.' || *r == '\0') return 0;
do {
D(9,("\tcheck_num_oid: '%c' %d",*r,n));