1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index 28ff7582bf..a4edb711ae 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -190,7 +190,7 @@ static int mem_write(BIO *b, const char *in, int inl)
 
         BIO_clear_retry_flags(b);
         blen=bm->length;
-        if (BUF_MEM_grow(bm,blen+inl) != (blen+inl))
+        if (BUF_MEM_grow_clean(bm,blen+inl) != (blen+inl))
                 goto end;
         memcpy(&(bm->data[blen]),in,inl);
         ret=inl;
@@ -284,7 +284,11 @@ static int mem_gets(BIO *bp, char *buf, int size)
 
         BIO_clear_retry_flags(bp);
         j=bm->length;
-        if (j <= 0) return(0);
+        if (j <= 0)
+                {
+                *buf='\0';
+                return 0;
+                }
         p=bm->data;
         for (i=0; i<j; i++)
                 {