Merge in recent changes from 0.9.6-stable.
This commit is contained in:
parent
e27fd320fc
commit
a09d349071
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user