diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-09-03 09:15:26 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-03 16:26:34 -0400 |
| commit | 64b25758edca688a30f02c260262150f7ad0bc7d (patch) | |
| tree | 15ad5a8c7985e2b27aaf7a14737fd980a36349dd /crypto/bio | |
| parent | fb4844bbc62fb014c115cd8fd2fc4304cba6eb89 (diff) | |
remove 0 assignments.
After openssl_zalloc, cleanup more "set to 0/NULL" assignments.
Many are from github feedback.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bf_buff.c | 10 | ||||
| -rw-r--r-- | crypto/bio/bf_nbio.c | 3 | ||||
| -rw-r--r-- | crypto/bio/bss_dgram.c | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c index 4fd8d15405..b7a3772979 100644 --- a/crypto/bio/bf_buff.c +++ b/crypto/bio/bf_buff.c @@ -91,27 +91,23 @@ BIO_METHOD *BIO_f_buffer(void) static int buffer_new(BIO *bi) { - BIO_F_BUFFER_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); + BIO_F_BUFFER_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx == NULL) return (0); + ctx->ibuf_size = DEFAULT_BUFFER_SIZE; ctx->ibuf = OPENSSL_malloc(DEFAULT_BUFFER_SIZE); if (ctx->ibuf == NULL) { OPENSSL_free(ctx); return (0); } + ctx->obuf_size = DEFAULT_BUFFER_SIZE; ctx->obuf = OPENSSL_malloc(DEFAULT_BUFFER_SIZE); if (ctx->obuf == NULL) { OPENSSL_free(ctx->ibuf); OPENSSL_free(ctx); return (0); } - ctx->ibuf_size = DEFAULT_BUFFER_SIZE; - ctx->obuf_size = DEFAULT_BUFFER_SIZE; - ctx->ibuf_len = 0; - ctx->ibuf_off = 0; - ctx->obuf_len = 0; - ctx->obuf_off = 0; bi->init = 1; bi->ptr = (char *)ctx; diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index 7980711d3d..2a2e3146a2 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -102,13 +102,12 @@ static int nbiof_new(BIO *bi) { NBIO_TEST *nt; - if ((nt = OPENSSL_malloc(sizeof(*nt))) == NULL) + if ((nt = OPENSSL_zalloc(sizeof(*nt))) == NULL) return (0); nt->lrn = -1; nt->lwn = -1; bi->ptr = (char *)nt; bi->init = 1; - bi->flags = 0; return (1); } diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index bbb9aca1c4..91474fcb60 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -225,10 +225,7 @@ static int dgram_new(BIO *bi) if (data == NULL) return 0; - bi->init = 0; - bi->num = 0; bi->ptr = data; - bi->flags = 0; return (1); } |