From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 8 Jul 2008 23:05:03 +0000 (+0000)
Subject: ITS#5558
X-Git-Tag: OPENLDAP_REL_ENG_2_4_11~55
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ace3c076a4a8fedb88bddff71718d8c2ddc5c280;p=openldap

ITS#5558
---

diff --git a/CHANGES b/CHANGES
index 6057ece1c8..1e6d1a6996 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.11 Engineering
 	Fixed slapd sets memory leak (ITS#5557)
-	Fixed slapd-sock buffer count (ITS#5558)
+	Fixed slapd-sock, back-shell buffer count (ITS#5558)
 	Added slapo-nssov contrib module
 	Fixed slapo-ppolicy DNs with whitespaces (ITS#5552)
 	Fixed slapo-syncprov ACL evaluation (ITS#5548)
diff --git a/servers/slapd/back-shell/result.c b/servers/slapd/back-shell/result.c
index 4713d3057c..b9a8af9763 100644
--- a/servers/slapd/back-shell/result.c
+++ b/servers/slapd/back-shell/result.c
@@ -80,7 +80,7 @@ read_and_send_results(
 		}
 
 		len = strlen( line );
-		while ( bp + len - buf > bsize ) {
+		while ( bp + len + 1 - buf > bsize ) {
 			size_t offset = bp - buf;
 			bsize += BUFSIZ;
 			buf = (char *) ch_realloc( buf, bsize );
diff --git a/servers/slapd/back-sock/result.c b/servers/slapd/back-sock/result.c
index f6fcad35ce..537d5bc78e 100644
--- a/servers/slapd/back-sock/result.c
+++ b/servers/slapd/back-sock/result.c
@@ -77,7 +77,7 @@ sock_read_and_send_results(
 		}
 
 		len = strlen( line );
-		while ( bp + len - buf > bsize ) {
+		while ( bp + len + 1 - buf > bsize ) {
 			size_t offset = bp - buf;
 			bsize += BUFSIZ;
 			buf = (char *) ch_realloc( buf, bsize );