Commit a556145a authored by Roberto Guimaraes's avatar Roberto Guimaraes Committed by Rich Salz
Browse files

prevent undefined behavior when src and dst are equal 



CLA: trivial

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

(cherry picked from commit 6aad9393)
parent b1f723c5

ssl/ssl_sess.c

+4 −2
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid, 
      return 0;

    }

    s->session_id_length = sid_len;

    if (sid != s->session_id)

        memcpy(s->session_id, sid, sid_len);

    return 1;

}
@@ -895,6 +896,7 @@ int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx, 
        return 0;

    }

    s->sid_ctx_length = sid_ctx_len;

    if (sid_ctx != s->sid_ctx)

        memcpy(s->sid_ctx, sid_ctx, sid_ctx_len);



    return 1;