Convert some malloc + memcpys into BUF_memdup.
Slightly tidier.
Change-Id: Ib3cb4dc262c88087bd56b446a6f7a05d1e57ade6
Reviewed-on: https://boringssl-review.googlesource.com/1345
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 6116f45..192a083 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1238,13 +1238,12 @@
else if (s->session && s->tlsext_session_ticket &&
s->tlsext_session_ticket->data)
{
- ticklen = s->tlsext_session_ticket->length;
- s->session->tlsext_tick = OPENSSL_malloc(ticklen);
+ s->session->tlsext_tick = BUF_memdup(
+ s->tlsext_session_ticket->data,
+ s->tlsext_session_ticket->length);
if (!s->session->tlsext_tick)
return NULL;
- memcpy(s->session->tlsext_tick,
- s->tlsext_session_ticket->data,
- ticklen);
+ ticklen = s->tlsext_session_ticket->length;
s->session->tlsext_ticklen = ticklen;
}
else
@@ -1687,13 +1686,12 @@
if (r == SSL_TLSEXT_ERR_OK) {
if (s->s3->alpn_selected)
OPENSSL_free(s->s3->alpn_selected);
- s->s3->alpn_selected = OPENSSL_malloc(selected_len);
+ s->s3->alpn_selected = BUF_memdup(selected, selected_len);
if (!s->s3->alpn_selected)
{
*out_alert = SSL_AD_INTERNAL_ERROR;
return 0;
}
- memcpy(s->s3->alpn_selected, selected, selected_len);
s->s3->alpn_selected_len = selected_len;
}
return 1;
