From b4a18d862bc7bd3112795cb7f05cf10a3b0a524a Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Tue, 12 Jan 2010 17:14:41 +0000 Subject: [PATCH] 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.1@239476 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_config_ldap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 3c58be1f29..e973b1caaa 100644 --- 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); -- 2.47.2