generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use safer sizeof variant in malloc

Browse Source 
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>
This commit is contained in:
Rich Salz
2015-05-01 23:10:31 -04:00
committed by Rich Salz
parent 8920a7cd04
commit b4faea50c3
142 changed files with 278 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/s3_enc.c
View File

@@ -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
/*