From c1f138c194d7d7dddb74c3a41215e8de638d7a26 Mon Sep 17 00:00:00 2001 From: Kurt Roeckx Date: Thu, 8 Dec 2016 19:20:55 +0100 Subject: [PATCH] Only call memcpy when the length is larger than 0. Reviewed-by: Rich Salz GH: #2050 (cherry picked from commit a19fc66a6b5f99ad00305e152bdb41460d728640) --- 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 5ea0919e4a..a7cf227ce4 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -1022,8 +1022,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 */ -- 2.25.1