Merge in recent changes from 0.9.6-stable.

This commit is contained in:
Richard Levitte 2002-05-09 19:38:34 +00:00
parent e27fd320fc
commit a09d349071

View File

@ -716,12 +716,13 @@ doapr_outch(
if (buffer) { if (buffer) {
while (*currlen >= *maxlen) { while (*currlen >= *maxlen) {
if (*buffer == NULL) { if (*buffer == NULL) {
assert(*sbuffer != NULL);
if (*maxlen == 0) if (*maxlen == 0)
*maxlen = 1024; *maxlen = 1024;
*buffer = OPENSSL_malloc(*maxlen); *buffer = OPENSSL_malloc(*maxlen);
if (*currlen > 0) if (*currlen > 0) {
assert(*sbuffer != NULL);
memcpy(*buffer, *sbuffer, *currlen); memcpy(*buffer, *sbuffer, *currlen);
}
*sbuffer = NULL; *sbuffer = NULL;
} else { } else {
*maxlen += 1024; *maxlen += 1024;