summaryrefslogtreecommitdiffstats
path: root/ssl/bio_ssl.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2015-08-25 19:25:58 +0200
committerRich Salz <rsalz@openssl.org>2015-09-03 04:05:37 +0200
commitb51bce942023325e727ca4225252d06c49d8f2b7 (patch)
tree59bbdee7553f9132a86aca17752a9a358a6355e2 /ssl/bio_ssl.c
parentmake update (diff)
downloadopenssl-b51bce942023325e727ca4225252d06c49d8f2b7.tar.xz
openssl-b51bce942023325e727ca4225252d06c49d8f2b7.zip
Add and use OPENSSL_zalloc
There are many places (nearly 50) where we malloc and then memset. Add an OPENSSL_zalloc routine to encapsulate that. (Missed one conversion; thanks Richard) Also fixes GH328 Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/bio_ssl.c')
-rw-r--r--ssl/bio_ssl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index aa6d623191..639b10556a 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -101,13 +101,12 @@ BIO_METHOD *BIO_f_ssl(void)
static int ssl_new(BIO *bi)
{
- BIO_SSL *bs = OPENSSL_malloc(sizeof(*bs));
+ BIO_SSL *bs = OPENSSL_zalloc(sizeof(*bs));
if (bs == NULL) {
BIOerr(BIO_F_SSL_NEW, ERR_R_MALLOC_FAILURE);
return (0);
}
- memset(bs, 0, sizeof(*bs));
bi->init = 0;
bi->ptr = (char *)bs;
bi->flags = 0;