[asterisk-commits] seanbright: branch 1.6.1 r239476 - in /branches/1.6.1: ./ res/res_config_ldap.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Jan 12 11:14:41 2010
New Revision: 239476

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239476
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_config_ldap.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_config_ldap.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/res/res_config_ldap.c?view=diff&rev=239476&r1=239475&r2=239476
==============================================================================
--- branches/1.6.1/res/res_config_ldap.c (original)
+++ branches/1.6.1/res/res_config_ldap.c Tue Jan 12 11:14:41 2010
@@ -1196,12 +1196,10 @@
 	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_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_type = ast_strdup(newparam);
+
+	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);