kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 201678 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-06-18 16:51:54 +00:00
parent c6c5ca6454
commit 09b65fe917
15 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_config_ldap.c
View File

@@ -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_msg);
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_msg);
ldap_mods_free(ldap_mods, 0);
return num_entries;