diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-01 23:10:31 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-04 15:00:13 -0400 |
| commit | b4faea50c35d92a67d1369355b49cc3efba78406 (patch) | |
| tree | cfebea69d625f936c9fd7281f1fa3eaa2fa38834 /ssl/s3_enc.c | |
| parent | 8920a7cd04f43b1a090d0b0a8c9e16b94c6898d4 (diff) | |
| download | openssl-b4faea50c35d92a67d1369355b49cc3efba78406.zip openssl-b4faea50c35d92a67d1369355b49cc3efba78406.tar.gz openssl-b4faea50c35d92a67d1369355b49cc3efba78406.tar.bz2 | |
Use safer sizeof variant in malloc
For a local variable:
TYPE *p;
Allocations like this are "risky":
p = OPENSSL_malloc(sizeof(TYPE));
if the type of p changes, and the malloc call isn't updated, you
could get memory corruption. Instead do this:
p = OPENSSL_malloc(sizeof(*p));
Also fixed a few memset() calls that I noticed while doing this.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 45de404..d968a1c 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -244,7 +244,7 @@ int ssl3_change_cipher_state(SSL *s, int which) if (s->enc_read_ctx != NULL) reuse_dd = 1; else if ((s->enc_read_ctx = - OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL) + OPENSSL_malloc(sizeof(*s->enc_read_ctx))) == NULL) goto err; else /* @@ -278,7 +278,7 @@ int ssl3_change_cipher_state(SSL *s, int which) if (s->enc_write_ctx != NULL) reuse_dd = 1; else if ((s->enc_write_ctx = - OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL) + OPENSSL_malloc(sizeof(*s->enc_write_ctx))) == NULL) goto err; else /* |