diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-12-07 18:04:48 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-12-07 18:04:48 +0000 |
commit | 81a38a63839c52b176338e5827c8eac77cad69ea (patch) | |
tree | 73c56de9a282e7b03dd60c3eaa0f0c8a96f5620d /crypto/openssl/crypto/asn1 | |
parent | 9a7a6128d10dead5833c948d62b6514fb3a54089 (diff) | |
download | src-81a38a63839c52b176338e5827c8eac77cad69ea.tar.gz src-81a38a63839c52b176338e5827c8eac77cad69ea.zip |
MFC: r326662
Merge OpenSSL 1.0.2n.
Notes
Notes:
svn path=/stable/11/; revision=326663
Diffstat (limited to 'crypto/openssl/crypto/asn1')
-rw-r--r-- | crypto/openssl/crypto/asn1/a_i2d_fp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/openssl/crypto/asn1/a_i2d_fp.c b/crypto/openssl/crypto/asn1/a_i2d_fp.c index 0f56cd4e0745..2e85e041e4cf 100644 --- a/crypto/openssl/crypto/asn1/a_i2d_fp.c +++ b/crypto/openssl/crypto/asn1/a_i2d_fp.c @@ -87,6 +87,9 @@ int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x) int i, j = 0, n, ret = 1; n = i2d(x, NULL); + if (n <= 0) + return 0; + b = (char *)OPENSSL_malloc(n); if (b == NULL) { ASN1err(ASN1_F_ASN1_I2D_BIO, ERR_R_MALLOC_FAILURE); |