[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.16, 1.17

Noriko Hosoi nhosoi at fedoraproject.org
Fri Dec 5 23:57:16 UTC 2008


Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27877

Modified Files:
	string.c 
Log Message:
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.



Index: string.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- string.c	15 Oct 2008 06:30:02 -0000	1.16
+++ string.c	5 Dec 2008 23:57:14 -0000	1.17
@@ -357,9 +357,12 @@
 	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 @@
  		 * 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,




More information about the Fedora-directory-commits mailing list