[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  8748dccbbab088d9b5484769343121051db78ed9 (commit)
      from  96d0c1a32b777807452c324cdc1f36db01edf8a1 (commit)


- Log -----------------------------------------------------------------
commit 8748dccbbab088d9b5484769343121051db78ed9
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri May 4 14:44:19 2018 +0200

    BIO_s_mem() write: Skip early when input length is zero
    
    When the input length is zero, just return zero early.  Otherwise,
    there's a small chance that memory allocation is engaged, fails and
    returns -1, which is a bit confusing when nothing should be written.
    
    Fixes #4782 #4827
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/6175)
    
    (cherry picked from commit 0d94212a046e87fafea6e83e8ea2b2a58db49979)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_mem.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index ff9a3eb..62b01cd 100644
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -212,6 +212,8 @@ static int mem_write(BIO *b, const char *in, int inl)
         goto end;
     }
     BIO_clear_retry_flags(b);
+    if (inl == 0)
+        return 0;
     blen = bbm->readp->length;
     mem_buf_sync(b);
     if (BUF_MEM_grow_clean(bbm->buf, blen + inl) == 0)