From c2549b040243e0fcaac0ec2e6d461980cda7f5f4 Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Mon, 11 Mar 2013 19:53:54 +0100
Subject: m_ldapoper Fix memory leak

See 1813369adecc1efc9812e90c40c21dc32e4965c9 for details
---
 src/modules/extra/m_ldapoper.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'src/modules')

diff --git a/src/modules/extra/m_ldapoper.cpp b/src/modules/extra/m_ldapoper.cpp
index e9e25630c..69131f7bc 100644
--- a/src/modules/extra/m_ldapoper.cpp
+++ b/src/modules/extra/m_ldapoper.cpp
@@ -35,6 +35,31 @@
 /* $ModDesc: Adds the ability to authenticate opers via LDAP */
 /* $LinkerFlags: -lldap */
 
+struct RAIILDAPString
+{
+	char *str;
+
+	RAIILDAPString(char *Str)
+		: str(Str)
+	{
+	}
+
+	~RAIILDAPString()
+	{
+		ldap_memfree(str);
+	}
+
+	operator char*()
+	{
+		return str;
+	}
+
+	operator std::string()
+	{
+		return str;
+	}
+};
+
 class ModuleLDAPAuth : public Module
 {
 	std::string base;
@@ -165,7 +190,8 @@ public:
 		authpass = strdup(opassword.c_str());
 		cred.bv_val = authpass;
 		cred.bv_len = opassword.length();
-		if ((res = ldap_sasl_bind_s(conn, ldap_get_dn(conn, entry), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) == LDAP_SUCCESS)
+		RAIILDAPString DN(ldap_get_dn(conn, entry));
+		if ((res = ldap_sasl_bind_s(conn, DN, LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) == LDAP_SUCCESS)
 		{
 			free(authpass);
 			ldap_msgfree(msg);
-- 
cgit v1.2.3