From: Sean Bright Date: Thu, 14 Jan 2010 23:18:34 +0000 (+0000) Subject: Merged revisions 240271 via svnmerge from X-Git-Tag: 1.6.1.15-rc1~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a48f50452d86e79fa7dff8e52aadb3f2cd2a1ca;p=thirdparty%2Fasterisk.git Merged revisions 240271 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r240271 | seanbright | 2010-01-14 18:13:02 -0500 (Thu, 14 Jan 2010) | 7 lines Plug a memory leak in res_config_ldap. (closes issue #16257) Reported by: nito Patches: issue16257_20100111.diff uploaded by seanbright (license 71) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240279 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index e973b1caaa..84602a3b2f 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -364,8 +364,10 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf ldap_entry = ldap_first_entry(ldapConn, ldap_result_msg); for (tot_count = 0; ldap_entry; tot_count++){ - tot_count += semicolon_count_var(realtime_ldap_entry_to_var(table_config, ldap_entry)); + struct ast_variable *tmp = realtime_ldap_entry_to_var(table_config, ldap_entry); + tot_count += semicolon_count_var(tmp); ldap_entry = ldap_next_entry(ldapConn, ldap_entry); + ast_variables_destroy(tmp); } if (entries_count_ptr)