aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-05-16 14:58:00 -0400
committerRich Salz <rsalz@openssl.org>2016-05-16 15:18:22 -0400
commit589902b2cbc667564642a0fdedfb2ef176dba0e8 (patch)
tree8a091682c5d833978c6d610f956c7c0321e8d6b7
parent2194351fdaab91cff94f921e633d46c9589b0d2c (diff)
downloadopenssl-589902b2cbc667564642a0fdedfb2ef176dba0e8.zip
openssl-589902b2cbc667564642a0fdedfb2ef176dba0e8.tar.gz
openssl-589902b2cbc667564642a0fdedfb2ef176dba0e8.tar.bz2
Use app_malloc; two missing cases.
Reviewed-by: Matt Caswell <matt@openssl.org>
-rw-r--r--apps/apps.c2
-rw-r--r--apps/s_client.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/apps.c b/apps/apps.c
index c7e01b0..1d3c66a 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2633,7 +2633,7 @@ void wait_for_async(SSL *s)
return;
if (numfds == 0)
return;
- fds = OPENSSL_malloc(sizeof(OSSL_ASYNC_FD) * numfds);
+ fds = app_malloc(sizeof(OSSL_ASYNC_FD) * numfds, "allocate async fds");
if (!SSL_get_all_async_fds(s, fds, &numfds)) {
OPENSSL_free(fds);
}
diff --git a/apps/s_client.c b/apps/s_client.c
index 42ef049..fada838 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -509,7 +509,7 @@ static ossl_ssize_t hexdecode(const char **inptr, void *result)
{
unsigned char **out = (unsigned char **)result;
const char *in = *inptr;
- unsigned char *ret = OPENSSL_malloc(strlen(in)/2);
+ unsigned char *ret = app_malloc(strlen(in)/2, "hexdecode");
unsigned char *cp = ret;
uint8_t byte;
int nibble = 0;