Use memmove() instead of memcpy() on areas that may overlap.

Spotted by Nalin Dahyabhai <nalin@redhat.com>

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index b27e9562b96cb2580c99013ecb415237fa1b1897..8cd36a395c8b5fe4f89672c1801a04f3dc2f4b86 100644 (file)
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -363,7 +363,7 @@ int ssl3_enc(SSL *s, int send)
        if ((s->session == NULL) || (ds == NULL) ||
                (enc == NULL))
                {
        if ((s->session == NULL) || (ds == NULL) ||
                (enc == NULL))
                {

-               memcpy(rec->data,rec->input,rec->length);
+               memmove(rec->data,rec->input,rec->length);

                rec->input=rec->data;
                }
        else
                rec->input=rec->data;
                }
        else

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 3077e9b9b9dd357ce6c70bcccfe207b98d65f331..5f0976f9e7a9983e8176edf56d7ca1a9db195f10 100644 (file)
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -464,7 +464,7 @@ int tls1_enc(SSL *s, int send)
        if ((s->session == NULL) || (ds == NULL) ||
                (enc == NULL))
                {
        if ((s->session == NULL) || (ds == NULL) ||
                (enc == NULL))
                {

-               memcpy(rec->data,rec->input,rec->length);
+               memmove(rec->data,rec->input,rec->length);

                rec->input=rec->data;
                }
        else
                rec->input=rec->data;
                }
        else