Merged revisions 239473 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r239473 | seanbright | 2010-01-12 12:09:12 -0500 (Tue, 12 Jan 2010) | 10 lines

  Fix crash in res_config_ldap.

  We need to allocate enough room for 2 pointers, not 2 characters.

  (closes issue #16397)
  Reported by: bklang
  Patches:
        res_config_ldap.patch uploaded by applsplatz (license 949)
  Tested by: applsplatz
........

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

diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 0a34758716dd3a6853edf626135ab6588580bebb..91f526e564a81f696e8020044a8283ebb7a3829c 100644 (file)
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -1196,12 +1196,10 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a
        ldap_mods[0] = ast_calloc(1, sizeof(LDAPMod));
 
        ldap_mods[0]->mod_op = LDAP_MOD_REPLACE;
-       ldap_mods[0]->mod_type = ast_calloc(sizeof(char), strlen(newparam) + 1);
-       strcpy(ldap_mods[0]->mod_type, newparam);
+       ldap_mods[0]->mod_type = ast_strdup(newparam);
 
-       ldap_mods[0]->mod_values = ast_calloc(sizeof(char), 2);
-       ldap_mods[0]->mod_values[0] = ast_calloc(sizeof(char), strlen(newval) + 1);
-       strcpy(ldap_mods[0]->mod_values[0], newval);
+       ldap_mods[0]->mod_values = ast_calloc(sizeof(char *), 2);
+       ldap_mods[0]->mod_values[0] = ast_strdup(newval);
 
        while ((newparam = va_arg(ap, const char *))) {
                newparam = convert_attribute_name_to_ldap(table_config, newparam);