diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-13 22:06:48 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-13 22:06:48 +0000 |
| commit | fe45df06ecc42c95c5492467fc77445d35da9806 (patch) | |
| tree | 259b574936077d87b88ed6d0429ba317078e0fcc /epan/dissectors/packet-kerberos.c | |
| parent | faf2bcf32bed174c963532d43fa12fde1ab9c0f1 (diff) | |
From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27718 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-kerberos.c')
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 06f3d89454..42b9942963 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -533,9 +533,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; @@ -748,8 +746,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; |