From c8bfd0cd85c3ec59e3fe90c2cf122f984db8288f Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Fri, 5 Dec 2008 23:57:49 +0000 Subject: Resolves: 459433 Summray: MMR: intensive conflict test crashes the server Description: values2keys functions in the syntax plugin did not check the existence of the input and output variable. --- ldap/servers/plugins/syntaxes/string.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ldap/servers/plugins/syntaxes/string.c') diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c index 3142491b..138d98af 100644 --- a/ldap/servers/plugins/syntaxes/string.c +++ b/ldap/servers/plugins/syntaxes/string.c @@ -357,9 +357,12 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, Slapi_Value **bvlp; char *w, *c, *p; + if (NULL == ivals) { + return 1; + } + *ivals = NULL; if (NULL == bvals) { - *ivals = NULL; - return 0; + return 1; } switch ( ftype ) { @@ -435,7 +438,7 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, * nsSubStrEnd: 2 * [...] * - * By default, begin == 2, middle == 3, end == 2 (defined in syntax.h) + * By default, begin == 3, middle == 3, end == 3 (defined in syntax.h) */ /* If nsSubStrLen is specified in each index entry, -- cgit