Missing braces, fix parsing
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 6 Mar 2008 05:21:39 +0000 (05:21 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 6 Mar 2008 05:21:39 +0000 (05:21 +0000)
(closes issue #12112)
 Reported by: cyrenity
 Patches:
       res_config_ldap.patch-03-03-2008 uploaded by cyrenity (license 416)
 Tested by: cyrenity, Corydon76

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

res/res_config_ldap.c

index ab71d8b..56f95ac 100644 (file)
@@ -687,7 +687,9 @@ static void append_var_and_value_to_filter(struct ast_str **filter,
        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 @@ static struct ast_variable **realtime_ldap_base_ap(unsigned int *entries_count_p
                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 *);