From: Roberto Guimaraes <rguimaraes@fastly.com>
Date: Sun, 26 Feb 2017 23:47:40 +0000 (-0800)
Subject: this change will prevent undefined behavior when src and dst are equal (memcpy),... 
X-Git-Tag: OpenSSL_1_1_1-pre1~2087
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6aad9393680ccde591905c8d71da92a241756394;p=oweals%2Fopenssl.git

this change will prevent undefined behavior when src and dst are equal (memcpy), effectively allowing setting length only in both functions.

CLA: trivial

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2750)
---

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 2e69176b8f..ab194979fc 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -835,7 +835,8 @@ int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,
       return 0;
     }
     s->session_id_length = sid_len;
-    memcpy(s->session_id, sid, sid_len);
+    if (sid != s->session_id)
+        memcpy(s->session_id, sid, sid_len);
     return 1;
 }
 
@@ -921,7 +922,8 @@ int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
         return 0;
     }
     s->sid_ctx_length = sid_ctx_len;
-    memcpy(s->sid_ctx, sid_ctx, sid_ctx_len);
+    if (sid_ctx != s->sid_ctx)
+        memcpy(s->sid_ctx, sid_ctx, sid_ctx_len);
 
     return 1;
 }