X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcharray.c;h=e3974e4ac05662ee3758b78cefdc1d40e7ff2e20;hb=5d64cae0fe2ed5c88fedb3082388e21b26d123c5;hp=b731cf1e9021fe81d93ee6cc3b79e2dffdcdacfe;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index b731cf1e90..e3974e4ac0 100644
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,9 +1,12 @@
 /* charray.c - routines for dealing with char * arrays */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 
 void
@@ -26,7 +29,7 @@ charray_add(
 		    (n + 2) * sizeof(char *) );
 	}
 
-	(*a)[n++] = s;
+	(*a)[n++] = ch_strdup(s);
 	(*a)[n] = NULL;
 }
 
@@ -48,7 +51,7 @@ charray_merge(
 	*a = (char **) ch_realloc( (char *) *a, (n + nn + 1) * sizeof(char *) );
 
 	for ( i = 0; i < nn; i++ ) {
-		(*a)[n + i] = s[i];
+		(*a)[n + i] = ch_strdup(s[i]);
 	}
 	(*a)[n + nn] = NULL;
 }
@@ -99,7 +102,7 @@ charray_dup( char **a )
 	new = (char **) ch_malloc( (i + 1) * sizeof(char *) );
 
 	for ( i = 0; a[i] != NULL; i++ ) {
-		new[i] = strdup( a[i] );
+		new[i] = ch_strdup( a[i] );
 	}
 	new[i] = NULL;
 
@@ -113,6 +116,9 @@ str2charray( char *str, char *brkstr )
 	char	*s;
 	int	i;
 
+	/* protect the input string from strtok */
+	str = ch_strdup( str );
+
 	i = 1;
 	for ( s = str; *s; s++ ) {
 		if ( strchr( brkstr, *s ) != NULL ) {
@@ -122,11 +128,18 @@ str2charray( char *str, char *brkstr )
 
 	res = (char **) ch_malloc( (i + 1) * sizeof(char *) );
 	i = 0;
+
+	pthread_mutex_lock(&strtok_mutex);
+
 	for ( s = strtok( str, brkstr ); s != NULL; s = strtok( NULL,
 	    brkstr ) ) {
-		res[i++] = strdup( s );
+		res[i++] = ch_strdup( s );
 	}
+
+	pthread_mutex_unlock(&strtok_mutex);
+
 	res[i] = NULL;
 
+	free( str );
 	return( res );
 }