diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-30 10:21:35 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-30 10:21:35 +0000 |
| commit | d566d4b6252a600eae176ff359aedeaba04e516f (patch) | |
| tree | fdb978e8f1ce08fd047e3a2355cfb03b2f790e67 /asn1 | |
| parent | f6925b29910c005eea15b2337d144c6098c2b6df (diff) | |
Apply r30376 to asn1 template files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30767 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ldap/packet-ldap-template.c | 4 | ||||
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 3 |
2 files changed, 2 insertions, 5 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, |