improve realloc/calloc/malloc patterns; ok guenther

1 files changed, 2 insertions, 4 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_new.c b/src/lib/libcrypto/asn1/tasn_new.c
index dc9ddc413a..56c6a19cfb 100644
--- a/src/lib/libcrypto/asn1/tasn_new.c
+++ b/src/lib/libcrypto/asn1/tasn_new.c
@@ -156,10 +156,9 @@ asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
                         }
                 }
                 if (!combine) {
-                        *pval = malloc(it->size);
+                        *pval = calloc(1, it->size);
                         if (!*pval)
                                 goto memerr;
-                        memset(*pval, 0, it->size);
                 }
                 asn1_set_choice_selector(pval, -1, it);
                 if (asn1_cb && !asn1_cb(ASN1_OP_NEW_POST, pval, it, NULL))
@@ -181,10 +180,9 @@ asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
                         }
                 }
                 if (!combine) {
-                        *pval = malloc(it->size);
+                        *pval = calloc(1, it->size);
                         if (!*pval)
                                 goto memerr;
-                        memset(*pval, 0, it->size);
                         asn1_do_lock(pval, 0, it);
                         asn1_enc_init(pval, it);
                 }