Apply patch suggested in ITS#2737 to address underallocation bug.

This could should be reworked to avoid multiple reallocs (likely
by overallocating).

diff --git a/libraries/liblunicode/ucstr.c b/libraries/liblunicode/ucstr.c
index a8c65df8616e8de76045f0ad346dd01837e7eb69..d854b2aead48fc17fdba9632b88fe7f4f4111cd0 100644 (file)
--- a/libraries/liblunicode/ucstr.c
+++ b/libraries/liblunicode/ucstr.c
@@ -251,6 +251,18 @@ struct berval * UTF8bvnormalize(
 
                last = i;
 
+               /* Allocate more space in out if necessary */
+               if (len - i > outsize - outpos) {
+                       outsize = outsize + ((len - i) - (outsize - outpos));
+                       outtmp = (char *) realloc(out, outsize);
+                       if (outtmp == NULL) {
+                               free(out);
+                               free(ucs);
+                               return NULL;
+                       }
+                       out = outtmp;
+               }
+
                /* s[i] is ascii */
                /* finish off everything up to char before next non-ascii */
                for ( i++; (i < len) && LDAP_UTF8_ISASCII(s + i); i++ ) {