As suggested by Jakub Zawadzki: g_free() is NULL safe, so we don't need check against it

(This change is to the currently unused asn1/kerberos/packet-kerberos-template.c).

svn path=/trunk/; revision=27726
This commit is contained in:
Bill Meier 2009-03-15 15:28:00 +00:00
parent 34c410795b
commit 691a5cbed2
1 changed files with 5 additions and 5 deletions

View File

@ -331,9 +331,7 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
input.ciphertext.data = (guint8 *)cryptotext;
data.length = length;
if(data.data){
g_free(data.data);
}
g_free(data.data);
data.data = g_malloc(length);
key.key.enctype=ek->keytype;
@ -546,8 +544,10 @@ clear_keytab(void) {
for(ske = service_key_list; ske != NULL; ske = g_slist_next(ske)){
sk = (service_key_t *) ske->data;
if (sk && sk->contents) g_free(sk->contents);
if (sk) g_free(sk);
if (sk) {
g_free(sk->contents);
g_free(sk);
}
}
g_slist_free(service_key_list);
service_key_list = NULL;