Add a check for a failed malloc
authorMatt Caswell <matt@openssl.org>
Tue, 15 Mar 2016 11:51:48 +0000 (11:51 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 18 Mar 2016 11:59:11 +0000 (11:59 +0000)
Ensure we check for a NULL return from OPENSSL_malloc

Issue reported by Guido Vranken.

Reviewed-by: Richard Levitte <levitte@openssl.org>
ssl/d1_both.c
ssl/t1_lib.c

index aaa1867..19c3da6 100644 (file)
@@ -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 */
index 090f93e..0bdb77d 100644 (file)
@@ -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 */