summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/d1_both.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2016-05-03 18:50:10 +0000
committerjkim <jkim@FreeBSD.org>2016-05-03 18:50:10 +0000
commit00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced (patch)
tree64905eaaef6c163463b7acbaca1a9724913735f5 /crypto/openssl/ssl/d1_both.c
parentc052df1347dcbd00de507acf0cfa03733e795db5 (diff)
parentacb827e3083196de4c00b67ac9ae3bf860ffd4a9 (diff)
downloadFreeBSD-src-00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced.zip
FreeBSD-src-00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced.tar.gz
Merge OpenSSL 1.0.2h.
Relnotes: yes
Diffstat (limited to 'crypto/openssl/ssl/d1_both.c')
-rw-r--r--crypto/openssl/ssl/d1_both.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/d1_both.c b/crypto/openssl/ssl/d1_both.c
index d1fc716..5d26c94 100644
--- a/crypto/openssl/ssl/d1_both.c
+++ b/crypto/openssl/ssl/d1_both.c
@@ -1459,6 +1459,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 */
OpenPOWER on IntegriCloud