aboutsummaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorJonas Maebe <jonas.maebe@elis.ugent.be>2013-12-09 17:21:43 +0100
committerKurt Roeckx <kurt@roeckx.be>2014-12-10 18:35:18 +0100
commit288b4e4f8f97069db63fdca6f6dddcf56282b03d (patch)
treeb72343ea546cc34e3f3211ef3750fc671c7f8339 /ssl
parentc27dc3981cd676cdd6dba00b06d6146545fc63fc (diff)
downloadopenssl-288b4e4f8f97069db63fdca6f6dddcf56282b03d.tar.gz
tls1_heartbeat: check for NULL after allocating buf
Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/t1_lib.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 4133c43ff2..8d5fd12903 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -4094,6 +4094,11 @@ tls1_heartbeat(SSL *s)
* - Padding
*/
buf = OPENSSL_malloc(1 + 2 + payload + padding);
+ if (buf == NULL)
+ {
+ SSLerr(SSL_F_TLS1_HEARTBEAT,ERR_R_MALLOC_FAILURE);
+ return -1;
+ }
p = buf;
/* Message Type */
*p++ = TLS1_HB_REQUEST;