[svn-commits] tilghman: trunk r106346 - /trunk/res/res_config_ldap.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Mar  5 23:21:39 2008
New Revision: 106346

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106346
Log:
Missing braces, fix parsing
(closes issue #12112)
 Reported by: cyrenity
 Patches: 
       res_config_ldap.patch-03-03-2008 uploaded by cyrenity (license 416)
 Tested by: cyrenity, Corydon76

Modified:
    trunk/res/res_config_ldap.c

Modified: trunk/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_ldap.c?view=diff&rev=106346&r1=106345&r2=106346
==============================================================================
--- trunk/res/res_config_ldap.c (original)
+++ trunk/res/res_config_ldap.c Wed Mar  5 23:21:39 2008
@@ -687,7 +687,9 @@
 	ast_debug(2, "name='%s' value='%s'\n", name, value);
 
 	if (like_pos) {
-		name = new_name = ast_strdupa(like_pos + strlen(" LIKE"));
+		int len = like_pos - name;
+		name = new_name = ast_strdupa(name);
+		new_name[len] = '\0';
 		value = new_value = ast_strdupa(value);
 		replace_string_in_string(new_value, "\\_", "_");
 		replace_string_in_string(new_value, "%", "*");
@@ -725,9 +727,10 @@
 		return NULL;
 	} 
 
-	if (!(filter = ast_str_create(80)))
+	if (!(filter = ast_str_create(80))) {
 		ast_free(clean_basedn);
 		return NULL;
+	}
 
 	/* Get the first parameter and first value in our list of passed paramater/value pairs  */
 	newparam = va_arg(ap, const char *);