--- ../openldap-2.4.10/servers/slapd/back-sock/result.c	2008-02-08 18:46:09.000000000 -0000
+++ servers/slapd/back-sock/result.c	2008-06-13 15:56:46.000000000 -0000
@@ -77,7 +77,7 @@
 		}
 
 		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 );
--- ../openldap-2.4.10/servers/slapd/back-shell/result.c	2008-02-11 17:26:47.000000000 -0000
+++ servers/slapd/back-shell/result.c	2008-06-13 15:57:02.000000000 -0000
@@ -80,7 +80,7 @@
 		}
 
 		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 );