diff options
| -rw-r--r-- | asn1/ldap/packet-ldap-template.c | 4 | ||||
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-ldap.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 4 |
4 files changed, 10 insertions, 13 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index fea4cefea6..28f1eaad55 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -515,9 +515,7 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as /* convert the string into a printable string */ if(is_ascii){ - ldapvalue_string=ep_alloc(len+1); - memcpy(ldapvalue_string,str,len); - ldapvalue_string[i]=0; + ldapvalue_string=ep_strndup(str, len); } else { ldapvalue_string=ep_alloc(3*len); for(i=0;i<len;i++){ diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 527d6fcd71..608edf1b0d 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -719,8 +719,7 @@ decrypt_gssapi_krb_cfx_wrap(proto_tree *tree _U_, packet_info *pinfo _U_, tvbuff if (output) { char *outdata; - outdata = g_malloc(tvb_length(tvb)); - memcpy(outdata, output, tvb_length(tvb)); + outdata = g_memdup(output, tvb_length(tvb)); g_free(output); pinfo->gssapi_decrypted_tvb=tvb_new_child_real_data(tvb, diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index b9be6c675e..03c73ec21c 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -314,7 +314,7 @@ static int hf_ldap_graceAuthNsRemaining = -1; /* INTEGER_0_maxInt */ static int hf_ldap_error = -1; /* T_error */ /*--- End of included file: packet-ldap-hf.c ---*/ -#line 181 "packet-ldap-template.c" +#line 180 "packet-ldap-template.c" /* Initialize the subtree pointers */ static gint ett_ldap = -1; @@ -377,7 +377,7 @@ static gint ett_ldap_PasswordPolicyResponseValue = -1; static gint ett_ldap_T_warning = -1; /*--- End of included file: packet-ldap-ett.c ---*/ -#line 192 "packet-ldap-template.c" +#line 191 "packet-ldap-template.c" static dissector_table_t ldap_name_dissector_table=NULL; static const char *object_identifier_id = NULL; /* LDAP OID */ @@ -3309,7 +3309,7 @@ static void dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_in /*--- End of included file: packet-ldap-fn.c ---*/ -#line 707 "packet-ldap-template.c" +#line 704 "packet-ldap-template.c" static void dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo, @@ -5187,7 +5187,7 @@ void proto_register_ldap(void) { "ldap.T_error", HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2080 "packet-ldap-template.c" +#line 2077 "packet-ldap-template.c" }; /* List of subtrees */ @@ -5252,7 +5252,7 @@ void proto_register_ldap(void) { &ett_ldap_T_warning, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2093 "packet-ldap-template.c" +#line 2090 "packet-ldap-template.c" }; module_t *ldap_module; @@ -5379,7 +5379,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2207 "packet-ldap-template.c" +#line 2204 "packet-ldap-template.c" } diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 0f43d25f9f..b24db58e1c 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1963,7 +1963,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1380 "packet-spnego-template.c" +#line 1379 "packet-spnego-template.c" }; /* List of subtrees */ @@ -1985,7 +1985,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1390 "packet-spnego-template.c" +#line 1389 "packet-spnego-template.c" }; /* Register protocol */ |