Merge branch 'tmp-session-ticket-valgrind' into 'master'

ext/session_ticket: eliminate redundant memcpy

See merge request gnutls/gnutls!1040

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 09e240c2d0..98db39ff88 100644
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -136,7 +136,11 @@ pack_ticket(const struct ticket_st *ticket, gnutls_datum_t *ticket_data)
 	_gnutls_write_uint16(ticket->encrypted_state_len, p);
 	p += 2;
 
-	memcpy(p, ticket->encrypted_state, ticket->encrypted_state_len);
+	/* We use memmove instead of memcpy here because
+	 * ticket->encrypted_state is allocated from
+	 * ticket_data->data, and thus both memory areas may overlap.
+	 */
+	memmove(p, ticket->encrypted_state, ticket->encrypted_state_len);
 	p += ticket->encrypted_state_len;
 
 	memcpy(p, ticket->mac, TICKET_MAC_SIZE);