From: Howard Chu <hyc@openldap.org>
Date: Tue, 1 Nov 2011 19:59:36 +0000 (-0700)
Subject: ITS#7060 fix str2result return code parsing
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d69ca65afd49740fdcbe55a389e312a841a47746;p=openldap

ITS#7060 fix str2result return code parsing
---

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 13a70ed9e9..1e8d406223 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -1694,15 +1694,16 @@ str2result(
 				continue;
 			}
 
-			while ( isspace( (unsigned char) next[ 0 ] ) ) next++;
-			if ( next[ 0 ] != '\0' ) {
+			while ( isspace( (unsigned char) next[ 0 ] ) && next[ 0 ] != '\n' )
+				next++;
+			if ( next[ 0 ] != '\0' && next[ 0 ] != '\n' ) {
 				Debug( LDAP_DEBUG_ANY, "str2result (%s) extra cruft after value\n",
 				    s, 0, 0 );
 				rc = -1;
 				continue;
 			}
 
-			/* FIXME: what if it's larger that max int? */
+			/* FIXME: what if it's larger than max int? */
 			*code = (int)retcode;
 
 		} else if ( strncasecmp( s, "matched", STRLENOF( "matched" ) ) == 0 ) {