diff options
author | jsing <> | 2021-12-03 16:58:11 +0000 |
---|---|---|
committer | jsing <> | 2021-12-03 16:58:11 +0000 |
commit | f162875e92493c34bc254b18bbb87884c6da2250 (patch) | |
tree | 5b15a98de763945f677cfeb6ee0254a194489dcf /src | |
parent | bd56135d9ad11bc1eb15ab9e1a278d7cdc43e626 (diff) | |
download | openbsd-f162875e92493c34bc254b18bbb87884c6da2250.tar.gz openbsd-f162875e92493c34bc254b18bbb87884c6da2250.tar.bz2 openbsd-f162875e92493c34bc254b18bbb87884c6da2250.zip |
Convert ASN1_OBJECT_new() to calloc().
Rather than using malloc() and then initialising all struct members, use
calloc() and only initialise the single non-zero value member.
ok schwarze@ tb@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/asn1/a_object.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c index 8600f80474..9b3bae0442 100644 --- a/src/lib/libcrypto/asn1/a_object.c +++ b/src/lib/libcrypto/asn1/a_object.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_object.c,v 1.32 2021/05/01 13:16:30 tb Exp $ */ | 1 | /* $OpenBSD: a_object.c,v 1.33 2021/12/03 16:58:11 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -354,20 +354,15 @@ err: | |||
354 | ASN1_OBJECT * | 354 | ASN1_OBJECT * |
355 | ASN1_OBJECT_new(void) | 355 | ASN1_OBJECT_new(void) |
356 | { | 356 | { |
357 | ASN1_OBJECT *ret; | 357 | ASN1_OBJECT *a; |
358 | 358 | ||
359 | ret = malloc(sizeof(ASN1_OBJECT)); | 359 | if ((a = calloc(1, sizeof(ASN1_OBJECT))) == NULL) { |
360 | if (ret == NULL) { | ||
361 | ASN1error(ERR_R_MALLOC_FAILURE); | 360 | ASN1error(ERR_R_MALLOC_FAILURE); |
362 | return (NULL); | 361 | return (NULL); |
363 | } | 362 | } |
364 | ret->length = 0; | 363 | a->flags = ASN1_OBJECT_FLAG_DYNAMIC; |
365 | ret->data = NULL; | 364 | |
366 | ret->nid = 0; | 365 | return a; |
367 | ret->sn = NULL; | ||
368 | ret->ln = NULL; | ||
369 | ret->flags = ASN1_OBJECT_FLAG_DYNAMIC; | ||
370 | return (ret); | ||
371 | } | 366 | } |
372 | 367 | ||
373 | void | 368 | void |