improve realloc/calloc/malloc patterns; ok guenther

1 files changed, 2 insertions, 6 deletions

diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index c578ce6279..f3cce8b536 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.c
@@ -153,7 +153,7 @@ c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **pp, long len)
 
         if (len-- > 1) /* using one because of the bits left byte */
         {
-                s = (unsigned char *)malloc((int)len);
+                s = malloc((int)len);
                 if (s == NULL) {
                         i = ERR_R_MALLOC_FAILURE;
                         goto err;
@@ -203,11 +203,7 @@ ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
         if ((a->length < (w + 1)) || (a->data == NULL)) {
                 if (!value)
                         return(1); /* Don't need to set */
-                if (a->data == NULL)
-                        c = (unsigned char *)malloc(w + 1);
-                else
-                        c = (unsigned char *)OPENSSL_realloc_clean(a->data,
-                            a->length, w + 1);
+                c = OPENSSL_realloc_clean(a->data, a->length, w + 1);
                 if (c == NULL) {
                         ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT, ERR_R_MALLOC_FAILURE);
                         return 0;