From: Sean Bright <sean@malleable.com>
Date: Sat, 29 Jan 2011 23:05:25 +0000 (+0000)
Subject: Plug some memory leaks in the LDAP realtime driver.
X-Git-Tag: 1.6.2.18-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54539cc9d9c6105aa74761aa64b2c59a338c2537;p=thirdparty%2Fasterisk.git

Plug some memory leaks in the LDAP realtime driver.

(closes issue #18435)
Reported by: zaltar
Patches:
      res_config_ldap.patch uploaded by zaltar (license 1148)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@304865 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 6c91ccc989..2c285bdcf7 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -330,6 +330,7 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config
 			}
 			ldap_value_free_len(values);
 		}
+		ldap_memfree(ldap_attribute_name);
 		ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber);
 	}
 	ber_free(ber, 0);
@@ -496,6 +497,7 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf
 					} /*!< for (v = values; *v; v++) */
 					ldap_value_free_len(values);
 				}/*!< if (values) */
+				ldap_memfree(ldap_attribute_name);
 				ldap_attribute_name = ldap_next_attribute(ldapConn, ldap_entry, ber);
 			} /*!< while (ldap_attribute_name) */
 			ber_free(ber, 0);
@@ -1311,7 +1313,7 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a
 			dn = ldap_get_dn(ldapConn, ldap_entry);
 			if ((error = ldap_modify_ext_s(ldapConn, dn, ldap_mods, NULL, NULL)) != LDAP_SUCCESS) 
 				ast_log(LOG_ERROR, "Couldn't modify dn:%s because %s", dn, ldap_err2string(error));
-
+			ldap_memfree(dn);
 			ldap_entry = ldap_next_entry(ldapConn, ldap_entry);
 		}
 	}
@@ -1493,7 +1495,7 @@ static int update2_ldap(const char *basedn, const char *table_name, va_list ap)
 			dn = ldap_get_dn(ldapConn, ldap_entry);
 			if ((error = ldap_modify_ext_s(ldapConn, dn, ldap_mods, NULL, NULL)) != LDAP_SUCCESS) 
 				ast_log(LOG_ERROR, "Couldn't modify dn:%s because %s", dn, ldap_err2string(error));
-
+			ldap_memfree(dn);
 			ldap_entry = ldap_next_entry(ldapConn, ldap_entry);
 		}
 	}