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_1-pre1~2870
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a19fc66a6b5f99ad00305e152bdb41460d728640;p=oweals%2Fopenssl.git

Only call memcpy when the length is larger than 0.

Reviewed-by: Rich Salz <rsalz@openssl.org>
GH: #2050
---

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 35ca8defa9..9b9d6cd6c7 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 */