diff options
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ldap/ldap.cnf | 4 | ||||
| -rw-r--r-- | asn1/spnego/spnego.cnf | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index 38ee6d81a6..8d5cc93111 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -458,7 +458,7 @@ ldap_conv_info_t *ldap_info; #.FN_BODY AttributeValue - tvbuff_t *next_tvb; + tvbuff_t *next_tvb = NULL; gchar *string; guint32 i, len; int old_offset = offset; @@ -469,7 +469,7 @@ ldap_conv_info_t *ldap_info; offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb); /* if we have an attribute type that isn't binary see if there is a better dissector */ - if(!attr_type || !dissector_try_string(ldap_name_dissector_table, attr_type, next_tvb, actx->pinfo, tree)) { + if(!attr_type || !next_tvb || !dissector_try_string(ldap_name_dissector_table, attr_type, next_tvb, actx->pinfo, tree)) { offset = old_offset; /* do the default thing */ diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index 1da039c96a..137493e675 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -23,6 +23,8 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC gssapi_oid_value *value; + MechType_oid = NULL; + %(DEFAULT_BODY)s value = gssapi_lookup_oid_str(MechType_oid); |