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/lhash/lhash.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/lhash/lhash.c')
| -rw-r--r-- | crypto/lhash/lhash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index ac3b5f607b..083310e825 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -117,9 +117,9 @@ _LHASH *lh_new(LHASH_HASH_FN_TYPE h, LHASH_COMP_FN_TYPE c) _LHASH *ret; int i; - if ((ret = OPENSSL_malloc(sizeof(_LHASH))) == NULL) + if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL) goto err0; - if ((ret->b = OPENSSL_malloc(sizeof(LHASH_NODE *) * MIN_NODES)) == NULL) + if ((ret->b = OPENSSL_malloc(sizeof(*ret->b) * MIN_NODES)) == NULL) goto err1; for (i = 0; i < MIN_NODES; i++) ret->b[i] = NULL; @@ -188,7 +188,7 @@ void *lh_insert(_LHASH *lh, void *data) rn = getrn(lh, data, &hash); if (*rn == NULL) { - if ((nn = OPENSSL_malloc(sizeof(LHASH_NODE))) == NULL) { + if ((nn = OPENSSL_malloc(sizeof(*nn))) == NULL) { lh->error++; return (NULL); } |