diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2016-09-22 10:15:26 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2016-09-22 10:15:26 -0400 |
| commit | 5998f019f85f765070f049332bf68d347d60c993 (patch) | |
| tree | 796531832eed643b2fec02ae7f0949e84d152968 /Cryptlib/OpenSSL/crypto/asn1/a_bytes.c | |
| parent | e3ef28acdfacfe07c42662d86af2135d1a100c24 (diff) | |
| parent | 62f0afa2ecead02b1258dabab8097ca278a22f8f (diff) | |
| download | efi-boot-shim-5998f019f85f765070f049332bf68d347d60c993.tar.gz efi-boot-shim-5998f019f85f765070f049332bf68d347d60c993.zip | |
New upstream release.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/asn1/a_bytes.c')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/asn1/a_bytes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/asn1/a_bytes.c b/Cryptlib/OpenSSL/crypto/asn1/a_bytes.c index 12715a72..385b5398 100644 --- a/Cryptlib/OpenSSL/crypto/asn1/a_bytes.c +++ b/Cryptlib/OpenSSL/crypto/asn1/a_bytes.c @@ -200,13 +200,13 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp, } else { if (len != 0) { if ((ret->length < len) || (ret->data == NULL)) { - if (ret->data != NULL) - OPENSSL_free(ret->data); s = (unsigned char *)OPENSSL_malloc((int)len + 1); if (s == NULL) { i = ERR_R_MALLOC_FAILURE; goto err; } + if (ret->data != NULL) + OPENSSL_free(ret->data); } else s = ret->data; memcpy(s, p, (int)len); |