[asterisk-commits] seanbright: branch 1.6.1 r240279 - in /branches/1.6.1: ./ res/res_config_ldap.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Jan 14 17:18:34 2010
New Revision: 240279

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240279
Log:
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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_config_ldap.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_config_ldap.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/res/res_config_ldap.c?view=diff&rev=240279&r1=240278&r2=240279
==============================================================================
--- branches/1.6.1/res/res_config_ldap.c (original)
+++ branches/1.6.1/res/res_config_ldap.c Thu Jan 14 17:18:34 2010
@@ -364,8 +364,10 @@
 	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)