diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-15 15:28:00 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-15 15:28:00 +0000 |
| commit | 99627dcb06274e609188ac55ffa39040554e392c (patch) | |
| tree | f5197ebe351b0ccb8b7653a86174db8e3392dcb3 /asn1 | |
| parent | 88dc5c02ef8fe231f6d133dae07a8726f55fac0c (diff) | |
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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27726 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 3eb3438fce..474e56f81c 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -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; |