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/objects/obj_dat.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/objects/obj_dat.c')
| -rw-r--r-- | crypto/objects/obj_dat.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index bca3dedd79..82af4a4006 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -255,19 +255,16 @@ int OBJ_add_object(const ASN1_OBJECT *obj) return (0); if ((o = OBJ_dup(obj)) == NULL) goto err; - if (!(ao[ADDED_NID] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) + if (!(ao[ADDED_NID] = OPENSSL_malloc(sizeof(*ao)))) goto err2; if ((o->length != 0) && (obj->data != NULL)) - if (! - (ao[ADDED_DATA] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) + if (!(ao[ADDED_DATA] = OPENSSL_malloc(sizeof(*ao)))) goto err2; if (o->sn != NULL) - if (! - (ao[ADDED_SNAME] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) + if (!(ao[ADDED_SNAME] = OPENSSL_malloc(sizeof(*ao)))) goto err2; if (o->ln != NULL) - if (! - (ao[ADDED_LNAME] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) + if (!(ao[ADDED_LNAME] = OPENSSL_malloc(sizeof(*ao)))) goto err2; for (i = ADDED_DATA; i <= ADDED_NID; i++) { |