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 /crypto/ex_data.c | |
| parent | 8920a7cd04f43b1a090d0b0a8c9e16b94c6898d4 (diff) | |
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 'crypto/ex_data.c')
| -rw-r--r-- | crypto/ex_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 96ecd94ca1..20a2dd7324 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -318,7 +318,7 @@ static EX_CLASS_ITEM *def_get_class(int class_index) CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA); p = lh_EX_CLASS_ITEM_retrieve(ex_data, &d); if (!p) { - gen = OPENSSL_malloc(sizeof(EX_CLASS_ITEM)); + gen = OPENSSL_malloc(sizeof(*gen)); if (gen) { gen->class_index = class_index; gen->meth_num = 0; @@ -350,7 +350,7 @@ static int def_add_index(EX_CLASS_ITEM *item, long argl, void *argp, CRYPTO_EX_free *free_func) { int toret = -1; - CRYPTO_EX_DATA_FUNCS *a = OPENSSL_malloc(sizeof(CRYPTO_EX_DATA_FUNCS)); + CRYPTO_EX_DATA_FUNCS *a = OPENSSL_malloc(sizeof(*a)); if (!a) { CRYPTOerr(CRYPTO_F_DEF_ADD_INDEX, ERR_R_MALLOC_FAILURE); return -1; |