diff options
| author | Pavel Kopyl <p.kopyl@samsung.com> | 2017-10-27 16:13:11 +0300 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-11-03 16:19:00 +0100 |
| commit | 950d49d43900e67a1f9d02bc1a053a9fdc5c4257 (patch) | |
| tree | cdd82b2607efa9cda55f074362680158720c5169 /crypto/asn1 | |
| parent | 200de404214ed045df66e371b1d0a60992ee33d0 (diff) | |
Add error handling in dsa_main and ASN1_i2d_bio.
CLA: trivial
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/4600)
(cherry picked from commit a6f622bc99ffdc7b34199babb9d200b24a7a6431)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_i2d_fp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c index 0f56cd4e07..2e85e041e4 100644 --- a/crypto/asn1/a_i2d_fp.c +++ b/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); |