diff options
| author | Robert Sloan <varomodt@google.com> | 2017-01-09 10:53:07 -0800 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2017-01-09 15:18:23 -0800 |
| commit | 69939df2891f62f7f00ff2ac275f1cd81a67454c (patch) | |
| tree | 467d0f510b31deef87dc70b119ea143090cc67a6 /src/crypto/asn1/tasn_dec.c | |
| parent | e7531f038363d24a103c820cff38898455ff66fe (diff) | |
| download | boringssl-69939df2891f62f7f00ff2ac275f1cd81a67454c.tar.gz | |
external/boringssl: Sync to 9c33ae85621ef8e00a42309b5101e0bedd02b816.android-n-mr2-preview-1
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/629db8cd0c84628e37aa81242b5b07fec7602f55..9c33ae85621ef8e00a42309b5101e0bedd02b816
Bug: 33622440
Test: BoringSSL tests
Change-Id: I20da15ad995a620b6b2f08db20c77ebd0f05ca10
Diffstat (limited to 'src/crypto/asn1/tasn_dec.c')
| -rw-r--r-- | src/crypto/asn1/tasn_dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypto/asn1/tasn_dec.c b/src/crypto/asn1/tasn_dec.c index dfbd222a..40778a84 100644 --- a/src/crypto/asn1/tasn_dec.c +++ b/src/crypto/asn1/tasn_dec.c @@ -1108,7 +1108,7 @@ static int collect_data(BUF_MEM *buf, const unsigned char **p, long plen) OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE); return 0; } - memcpy(buf->data + len, *p, plen); + OPENSSL_memcpy(buf->data + len, *p, plen); } *p += plen; return 1; |