projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d15f5df
)
dtls1_heartbeat: check for NULL after allocating s->cert->ctypes
author
Jonas Maebe
<jonas.maebe@elis.ugent.be>
Sun, 8 Dec 2013 22:29:43 +0000
(23:29 +0100)
committer
Kurt Roeckx
<kurt@roeckx.be>
Thu, 4 Dec 2014 22:48:44 +0000
(23:48 +0100)
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Richard Levitte <levitte@openssl.org>
ssl/d1_both.c
patch
|
blob
|
history
diff --git
a/ssl/d1_both.c
b/ssl/d1_both.c
index 41ef5cb4f8af7e4f5282bf329cd93c208b5aef0f..877a2bfbc6fa69a7a3a7a82cc8b50604eb177487 100644
(file)
--- a/
ssl/d1_both.c
+++ b/
ssl/d1_both.c
@@
-1481,6
+1481,11
@@
dtls1_heartbeat(SSL *s)
* - Padding
*/
buf = OPENSSL_malloc(1 + 2 + payload + padding);
+ if (buf == NULL)
+ {
+ SSLerr(SSL_F_DTLS1_HEARTBEAT, ERR_R_MALLOC_FAILURE);
+ return -1;
+ }
p = buf;
/* Message Type */
*p++ = TLS1_HB_REQUEST;