From: Kurt Roeckx <kurt@roeckx.be>
Date: Thu, 8 Dec 2016 18:20:55 +0000 (+0100)
Subject: Only call memcpy when the length is larger than 0.
X-Git-Tag: OpenSSL_1_1_0d~93
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c1f138c194d7d7dddb74c3a41215e8de638d7a26;p=oweals%2Fopenssl.git

Only call memcpy when the length is larger than 0.

Reviewed-by: Rich Salz <rsalz@openssl.org>
GH: #2050
(cherry picked from commit a19fc66a6b5f99ad00305e152bdb41460d728640)
---

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 */