From d69ca65afd49740fdcbe55a389e312a841a47746 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 1 Nov 2011 12:59:36 -0700 Subject: [PATCH] ITS#7060 fix str2result return code parsing --- servers/slapd/result.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 ) { -- 2.39.5