Merge in recent changes from 0.9.6-stable.

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index f0a50c29bed5547c7e7a649c9e5ede17ef384022..d7a60eceea38dad23cb3fe449349fbeafa3bc0d7 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -716,12 +716,13 @@ doapr_outch(
     if (buffer) {
        while (*currlen >= *maxlen) {
            if (*buffer == NULL) {
-               assert(*sbuffer != NULL);
                if (*maxlen == 0)
                    *maxlen = 1024;
                *buffer = OPENSSL_malloc(*maxlen);
-               if (*currlen > 0)
+               if (*currlen > 0) {
+                   assert(*sbuffer != NULL);
                    memcpy(*buffer, *sbuffer, *currlen);
+               }
                *sbuffer = NULL;
            } else {
                *maxlen += 1024;