[openssl-commits] [openssl] master update
Kurt Roeckx
kurt at openssl.org
Thu Dec 8 19:17:09 UTC 2016
The branch master has been updated
via a19fc66a6b5f99ad00305e152bdb41460d728640 (commit)
from 120fb9e43656e1801c75a4fbb7c178ebec9bac18 (commit)
- Log -----------------------------------------------------------------
commit a19fc66a6b5f99ad00305e152bdb41460d728640
Author: Kurt Roeckx <kurt at roeckx.be>
Date: Thu Dec 8 19:20:55 2016 +0100
Only call memcpy when the length is larger than 0.
Reviewed-by: Rich Salz <rsalz at openssl.org>
GH: #2050
-----------------------------------------------------------------------
Summary of changes:
ssl/statem/statem_clnt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 35ca8de..9b9d6cd 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1186,8 +1186,9 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt)
s->session->ssl_version = s->version;
s->session->session_id_length = session_id_len;
/* session_id_len could be 0 */
- memcpy(s->session->session_id, PACKET_data(&session_id),
- session_id_len);
+ if (session_id_len > 0)
+ memcpy(s->session->session_id, PACKET_data(&session_id),
+ session_id_len);
}
/* Session version and negotiated protocol version should match */
More information about the openssl-commits
mailing list