ITS#5558

diff --git a/CHANGES b/CHANGES
index 6057ece1c888733d4fde4f83827e799858c64d56..1e6d1a6996e93a9f38c2b111f1e5e6f5c17e5969 100644 (file)
--- 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 4713d3057caa820d5ad18b3077767c569ac1d62f..b9a8af976318eeb0d526435ed8d9eee869850b93 100644 (file)
--- 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 f6fcad35cebfe9f48cd24a93fd3788ab3f429edf..537d5bc78e34506256205b448015042db79c50b7 100644 (file)
--- 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 );