diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-18 16:37:42 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-18 16:37:42 +0000 |
commit | 7803be8ee42ad67cee69a9eaffbc2fafe07bf14f (patch) | |
tree | 9e55718a16861e122cd8aed23e4b4f0369fdec92 /res | |
parent | 160722f2579aec0cf074b8bd1d0e4c6fa21e0294 (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: http://svn.digium.com/svn/asterisk/trunk@201678 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/ael/ael_lex.c | 6 | ||||
-rw-r--r-- | res/res_config_ldap.c | 18 |
2 files changed, 8 insertions, 16 deletions
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c index 4e792aefe..6517644bd 100644 --- a/res/ael/ael_lex.c +++ b/res/ael/ael_lex.c @@ -3221,8 +3221,7 @@ static void pbcpush(char x) void ael_yyfree(void *ptr, yyscan_t yyscanner) { - if (ptr) - free( (char*) ptr ); + free( (char*) ptr ); } static int pbcpop(char x) @@ -3361,8 +3360,7 @@ struct pval *ael2_parse(char *filename, int *errors) *errors = 1; return 0; } - if (my_file) - free(my_file); + free(my_file); my_file = strdup(filename); stat(filename, &stats); buffer = (char*)malloc(stats.st_size+2); 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; |