memset, memcpy, sizeof consistency fixes

[openssl.git] / crypto / asn1 / a_enum.c

diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c
index 00312b072df4df207a089739a10d5b7207195db9..aed3de5feefb3572078a216c2b03ffe9177047f0 100644 (file)
--- a/crypto/asn1/a_enum.c
+++ b/crypto/asn1/a_enum.c
@@ -75,11 +75,9 @@ int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
 
     a->type = V_ASN1_ENUMERATED;
     if (a->length < (int)(sizeof(long) + 1)) {
-        if (a->data != NULL)
-            OPENSSL_free(a->data);
-        if ((a->data =
-             (unsigned char *)OPENSSL_malloc(sizeof(long) + 1)) != NULL)
-            memset((char *)a->data, 0, sizeof(long) + 1);
+        OPENSSL_free(a->data);
+        if ((a->data = OPENSSL_malloc(sizeof(long) + 1)) != NULL)
+            memset(a->data, 0, sizeof(long) + 1);
     }
     if (a->data == NULL) {
         ASN1err(ASN1_F_ASN1_ENUMERATED_SET, ERR_R_MALLOC_FAILURE);