diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2016-10-01 14:18:49 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2016-10-01 14:18:49 -0700 |
| commit | b65e78ec015a308c1798e602c94502327cc90cd9 (patch) | |
| tree | 4185dc52bcba0af1f815b88e100cd68a626916ca /Cryptlib/OpenSSL/crypto/asn1/a_bytes.c | |
| parent | 21ebe03556d7030055644f46efd3c165396a7a75 (diff) | |
| parent | 86b44a70f0e22233427cef3e966869e59b5e9dd5 (diff) | |
| download | efi-boot-shim-b65e78ec015a308c1798e602c94502327cc90cd9.tar.gz efi-boot-shim-b65e78ec015a308c1798e602c94502327cc90cd9.zip | |
Resync with Ubuntu, including patch to fix debian/copyright.
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); |