diff options
| author | David Vossel <dvossel@digium.com> | 2009-06-18 16:37:42 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-06-18 16:37:42 +0000 |
| commit | dcfe69ec6454cecae1d6c25bbaf33e26a531b3ff (patch) | |
| tree | 9e55718a16861e122cd8aed23e4b4f0369fdec92 /res/res_config_ldap.c | |
| parent | 730e60e583292b45b175a021fef98a5066f0827f (diff) | |
fixes some memory leaks and redundant conditions
(closes issue #15269)
Reported by: contactmayankjain
Patches:
patch.txt uploaded by contactmayankjain (license 740)
memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
Tested by: contactmayankjain, dvossel
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_config_ldap.c')
| -rw-r--r-- | res/res_config_ldap.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 770188fba..e0cb5946b 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -1271,10 +1271,8 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a ldap_err2string(result)); ast_mutex_unlock(&ldap_lock); - if (filter) - free(filter); - if (clean_basedn) - free(clean_basedn); + free(filter); + free(clean_basedn); ldap_msgfree(ldap_result_msg); ldap_mods_free(ldap_mods, 0); return -1; @@ -1297,10 +1295,8 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a } ast_mutex_unlock(&ldap_lock); - if (filter) - free(filter); - if (clean_basedn) - free(clean_basedn); + free(filter); + free(clean_basedn); ldap_msgfree(ldap_result_msg); ldap_mods_free(ldap_mods, 0); return num_entries; @@ -1458,10 +1454,8 @@ static int update2_ldap(const char *basedn, const char *table_name, va_list ap) ldap_err2string(result)); ast_mutex_unlock(&ldap_lock); - if (filter) - free(filter); - if (clean_basedn) - free(clean_basedn); + free(filter); + free(clean_basedn); ldap_msgfree(ldap_result_msg); ldap_mods_free(ldap_mods, 0); return -1; |