Add a check for a failed malloc

Ensure we check for a NULL return from OPENSSL_malloc

Issue reported by Guido Vranken.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index aaa18677ceef0c7f7f9afd5bf5c2deb3129227b0..19c3da61612233f043fa12697a4b96a9c280fcc9 100644 (file)
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1579,6 +1579,8 @@ int dtls1_process_heartbeat(SSL *s)
          * plus 2 bytes payload length, plus payload, plus padding
          */
         buffer = OPENSSL_malloc(write_length);
+        if (buffer == NULL)
+            return -1;
         bp = buffer;
 
         /* Enter response type, length and copy payload */

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 090f93ef62cc033ea6fd1a6c03986fa90a4a5fac..0bdb77d49fc311a9434e731e22bb1b3d913ab6d2 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2581,6 +2581,8 @@ int tls1_process_heartbeat(SSL *s)
          * plus 2 bytes payload length, plus payload, plus padding
          */
         buffer = OPENSSL_malloc(1 + 2 + payload + padding);
+        if (buffer == NULL)
+            return -1;
         bp = buffer;
 
         /* Enter response type, length and copy payload */