[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  53ba0a9e91ad203de2943edaf1090ab17ec435fa (commit)
      from  539ed89f686866b82a9ec9a4c3b112878d29cd73 (commit)


- Log -----------------------------------------------------------------
commit 53ba0a9e91ad203de2943edaf1090ab17ec435fa
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri May 1 22:06:07 2015 -0400

    RT3776: Wrong size for malloc
    
    Use sizeof *foo parameter, to avoid these errors.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509_vpm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 29ee8a7..6305406 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -161,16 +161,16 @@ X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void)
     X509_VERIFY_PARAM *param;
     X509_VERIFY_PARAM_ID *paramid;
 
-    param = OPENSSL_malloc(sizeof(X509_VERIFY_PARAM));
+    param = OPENSSL_malloc(sizeof *param);
     if (!param)
         return NULL;
-    paramid = OPENSSL_malloc(sizeof(X509_VERIFY_PARAM));
+    paramid = OPENSSL_malloc(sizeof *paramid);
     if (!paramid) {
         OPENSSL_free(param);
         return NULL;
     }
-    memset(param, 0, sizeof(X509_VERIFY_PARAM));
-    memset(paramid, 0, sizeof(X509_VERIFY_PARAM_ID));
+    memset(param, 0, sizeof *paramid);
+    memset(paramid, 0, sizeof *paramid);
     param->id = paramid;
     x509_verify_param_zero(param);
     return param;