memset, memcpy, sizeof consistency fixes

[openssl.git] / ssl / bio_ssl.c

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 473b3ff51992fdd8bdef63d3028e66330655bff1..aa6d623191c48ce25d7c89cb8e87dcd938c28b26 100644 (file)
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -101,14 +101,13 @@ BIO_METHOD *BIO_f_ssl(void)
 
 static int ssl_new(BIO *bi)
 {
 
 static int ssl_new(BIO *bi)
 {

-    BIO_SSL *bs;
+    BIO_SSL *bs = OPENSSL_malloc(sizeof(*bs));

 
 

-    bs = (BIO_SSL *)OPENSSL_malloc(sizeof(BIO_SSL));

     if (bs == NULL) {
         BIOerr(BIO_F_SSL_NEW, ERR_R_MALLOC_FAILURE);
         return (0);
     }
     if (bs == NULL) {
         BIOerr(BIO_F_SSL_NEW, ERR_R_MALLOC_FAILURE);
         return (0);
     }

-    memset(bs, 0, sizeof(BIO_SSL));
+    memset(bs, 0, sizeof(*bs));

     bi->init = 0;
     bi->ptr = (char *)bs;
     bi->flags = 0;
     bi->init = 0;
     bi->ptr = (char *)bs;
     bi->flags = 0;


@@ -130,8 +129,7 @@ static int ssl_free(BIO *a)
         a->init = 0;
         a->flags = 0;
     }
         a->init = 0;
         a->flags = 0;
     }

-    if (a->ptr != NULL)
-        OPENSSL_free(a->ptr);
+    OPENSSL_free(a->ptr);

     return (1);
 }
 
     return (1);
 }