[asterisk-commits] tilghman: branch 1.6.0 r114086 - in /branches/1.6.0: ./ res/res_config_ldap.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Apr 11 18:13:07 2008
New Revision: 114086

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114086
Log:
Merged revisions 114085 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r114085 | tilghman | 2008-04-11 18:12:16 -0500 (Fri, 11 Apr 2008) | 7 lines

Use the correct function for free'ing objects, and maybe we won't crash.
(closes issue #12163)
 Reported by: gservat
 Patches: 
       20080411__bug12163.diff.txt uploaded by Corydon76 (license 14)
 Tested by: gservat

........

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

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

Modified: branches/1.6.0/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_config_ldap.c?view=diff&rev=114086&r1=114085&r2=114086
==============================================================================
--- branches/1.6.0/res/res_config_ldap.c (original)
+++ branches/1.6.0/res/res_config_ldap.c Fri Apr 11 18:13:07 2008
@@ -326,7 +326,7 @@
 				}
 				v++;
 			}
-			ber_bvecfree(values);
+			ldap_value_free_len(values);
 		}
 		ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber);
 	}
@@ -492,7 +492,7 @@
 						}
 						v++;
 					} /*!< while(*v) */
-					ber_bvecfree(values);
+					ldap_value_free_len(values);
 				}/*!< if (values) */
 				ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber);
 			} /*!< while (ldap_attribute_name) */