diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-18 16:58:03 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-18 16:58:03 +0000 |
commit | 0740578e6df8e4cb4cb49a2550f5946ceaf0e509 (patch) | |
tree | 2bbf3d469c8e0fd61393b6e8d9c2abcfac0107ce /res | |
parent | c6e74d7f36371d508de5ec7ebcd838913c75ce1c (diff) |
Merged revisions 201678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines
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/branches/1.6.0@201682 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 | 20 |
2 files changed, 8 insertions, 18 deletions
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c index 0271a4a53..b3fa11b26 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 1e178cdcd..d6f9668fe 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -871,12 +871,8 @@ static struct ast_variable **realtime_ldap_base_ap(unsigned int *entries_count_p } } - if (filter) - ast_free(filter); - - if (clean_basedn) - ast_free(clean_basedn); - + ast_free(filter); + ast_free(clean_basedn); ast_mutex_unlock(&ldap_lock); return vars; @@ -1270,10 +1266,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); ldap_mods_free(ldap_mods, 0); return -1; @@ -1296,10 +1290,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); ldap_mods_free(ldap_mods, 0); return num_entries; |