Fix back-shell realloc bug (reverting version to 1.2.11re)

diff --git a/CHANGES b/CHANGES
index af1ef9a309858ff95ca97a8bf02a2c8719d43346..29ad95ddbef8bbd1b668f5540965043dd6297a62 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,5 @@
 OpenLDAP Change Log
 
-Changes included in OpenLDAP 1.2.12 Release Engineering
-       CVS Tag: OPENLDAP_REL_ENG_1_2_12
-       <insert changes here>
-
 Changes included in OpenLDAP 1.2.11
        CVS Tag: OPENLDAP_REL_ENG_1_2_11
        Fixed /tmp races in ud, ldapsearch, ldbmtest and slurpd
@@ -16,6 +12,7 @@ Changes included in OpenLDAP 1.2.11
        Fixed ACL groups member matching
        Raise MAXDBCACHE to 128 (ITS#512)
        Fixed slapd client_addr crash (ITS#579)
+       Fixed back-shell realloc bug (ITS#506)
        Build Environment
                Update res_search detection
                Detect and use getpassphrase() and getpass()

diff --git a/build/version b/build/version
index 756eb78e283354514a308ca2eeb65eb6679d70e4..3d4eab0efdd5ae7d8e7554aa2efa0f10b6d2be7b 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.2.12-Engineering
+1.2.11-Engineering

diff --git a/servers/slapd/back-shell/result.c b/servers/slapd/back-shell/result.c
index daa826775d0055a6d0cf113d2e47e7162935d54d..080f92860fa9a4dc7e7916bea515a0344e69f238 100644 (file)
--- a/servers/slapd/back-shell/result.c
+++ b/servers/slapd/back-shell/result.c
@@ -42,8 +42,10 @@ read_and_send_results(
                }
                len = strlen( line );
                while ( bp + len - buf > bsize ) {
+                       size_t offset = bp - buf;
                        bsize += BUFSIZ;
                        buf = (char *) ch_realloc( buf, bsize );
+                       bp = &buf[offset];
                }
                strcpy( bp, line );
                bp += len;