From: Rich Salz <rsalz@openssl.org>
Date: Mon, 16 May 2016 18:58:00 +0000 (-0400)
Subject: Use app_malloc; two missing cases.
X-Git-Tag: OpenSSL_1_1_0-pre6~818
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=589902b2cbc667564642a0fdedfb2ef176dba0e8;p=oweals%2Fopenssl.git

Use app_malloc; two missing cases.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/apps/apps.c b/apps/apps.c
index c7e01b0cc4..1d3c66a1ae 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 42ef049d24..fada838b68 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;