diff options
| -rw-r--r-- | asn1/ldap/ldap.cnf | 4 | ||||
| -rw-r--r-- | asn1/spnego/spnego.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ldap.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 16 |
4 files changed, 15 insertions, 11 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); diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 676ffef919..290877239d 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -2156,7 +2156,7 @@ static int dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 460 "ldap.cnf" - tvbuff_t *next_tvb; + tvbuff_t *next_tvb = NULL; gchar *string; guint32 i, len; int old_offset = offset; @@ -2167,7 +2167,7 @@ dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of 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/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 24f62b58c7..373ea0cfa4 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -161,6 +161,8 @@ dissect_spnego_MechType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset gssapi_oid_value *value; + MechType_oid = NULL; + offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &MechType_oid); @@ -195,7 +197,7 @@ static const ber_sequence_t MechTypeList_sequence_of[1] = { static int dissect_spnego_MechTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 91 "spnego.cnf" +#line 93 "spnego.cnf" conversation_t *conversation; @@ -244,7 +246,7 @@ dissect_spnego_ContextFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_spnego_T_mechToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 112 "spnego.cnf" +#line 114 "spnego.cnf" tvbuff_t *mechToken_tvb = NULL; @@ -269,7 +271,7 @@ dissect_spnego_T_mechToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_spnego_T_NegTokenInit_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 126 "spnego.cnf" +#line 128 "spnego.cnf" gint8 class; gboolean pc; @@ -350,7 +352,7 @@ dissect_spnego_T_negResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_spnego_T_supportedMech(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 164 "spnego.cnf" +#line 166 "spnego.cnf" conversation_t *conversation; @@ -379,7 +381,7 @@ dissect_spnego_T_supportedMech(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_spnego_T_responseToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 187 "spnego.cnf" +#line 189 "spnego.cnf" tvbuff_t *responseToken_tvb; @@ -413,7 +415,7 @@ dissect_spnego_T_responseToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_spnego_T_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 214 "spnego.cnf" +#line 216 "spnego.cnf" tvbuff_t *mechListMIC_tvb; @@ -509,7 +511,7 @@ dissect_spnego_PrincipalSeq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_spnego_InnerContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 48 "spnego.cnf" +#line 50 "spnego.cnf" gssapi_oid_value *next_level_value_lcl; proto_item *item; |