diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-12 17:14:43 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-12 17:14:43 +0000 |
| commit | 5126ecfacdc6b6af9d7f0d5cddb6d4427d9c3a97 (patch) | |
| tree | 864b21e5e2801a9ab602a8165256e6408ffd3cad /res | |
| parent | 5c946587e02b50bee33b585419846186fca19611 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@239477 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_ldap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index d06476279..91ea260ce 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -1201,12 +1201,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); |