From ea166cfd008636287d5f57fc572921fdf4106c6d Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 21 Apr 2014 16:48:59 +0000 Subject: [PATCH] use mallocarray(a,b) instead of malloc(a*b) --- lib/libssl/src/ssl/ssl_ciph.c | 4 ++-- lib/libssl/ssl_ciph.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libssl/src/ssl/ssl_ciph.c b/lib/libssl/src/ssl/ssl_ciph.c index 41632720be3..070d6a10e5e 100644 --- a/lib/libssl/src/ssl/ssl_ciph.c +++ b/lib/libssl/src/ssl/ssl_ciph.c @@ -1328,7 +1328,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method, #ifdef KSSL_DEBUG printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers); #endif /* KSSL_DEBUG */ - co_list = (CIPHER_ORDER *)malloc(sizeof(CIPHER_ORDER) * num_of_ciphers); + co_list = mallocarray(num_of_ciphers, sizeof(CIPHER_ORDER)); if (co_list == NULL) { SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); return(NULL); /* Failure */ @@ -1390,7 +1390,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method, */ num_of_group_aliases = sizeof(cipher_aliases) / sizeof(SSL_CIPHER); num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1; - ca_list = malloc(sizeof(SSL_CIPHER *) * num_of_alias_max); + ca_list = mallocarray(num_of_alias_max, sizeof(SSL_CIPHER *)); if (ca_list == NULL) { free(co_list); SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c index 41632720be3..070d6a10e5e 100644 --- a/lib/libssl/ssl_ciph.c +++ b/lib/libssl/ssl_ciph.c @@ -1328,7 +1328,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method, #ifdef KSSL_DEBUG printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers); #endif /* KSSL_DEBUG */ - co_list = (CIPHER_ORDER *)malloc(sizeof(CIPHER_ORDER) * num_of_ciphers); + co_list = mallocarray(num_of_ciphers, sizeof(CIPHER_ORDER)); if (co_list == NULL) { SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); return(NULL); /* Failure */ @@ -1390,7 +1390,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method, */ num_of_group_aliases = sizeof(cipher_aliases) / sizeof(SSL_CIPHER); num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1; - ca_list = malloc(sizeof(SSL_CIPHER *) * num_of_alias_max); + ca_list = mallocarray(num_of_alias_max, sizeof(SSL_CIPHER *)); if (ca_list == NULL) { free(co_list); SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); -- 2.20.1