diff options
| author | bonniegong <46280630+bonniegong@users.noreply.github.com> | 2021-04-12 10:43:13 +0800 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-14 10:14:53 +1000 |
| commit | a812f8fc8f3c9ba30e5ecd2c168cca0613f15dcd (patch) | |
| tree | 93ce1ede8937f06d3998962b2d8d6b0f9392626d /crypto/asn1 | |
| parent | 9a48d4a4fec6827d387ee63756504892e3656299 (diff) | |
check i2d_ASN1_TYPE return value
add a length check to the return value of function i2d_ASN1_TYPE. Return an error instead of trying to malloc a negative number.
CLA: trivial
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14828)
(cherry picked from commit c65abf2213117eb5348a46fbc18f706aca052e85)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_strex.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 4879b33785..7cd18b4b85 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -280,6 +280,8 @@ static int do_dump(unsigned long lflags, char_io *io_ch, void *arg, t.type = str->type; t.value.ptr = (char *)str; der_len = i2d_ASN1_TYPE(&t, NULL); + if (der_len <= 0) + return -1; if ((der_buf = OPENSSL_malloc(der_len)) == NULL) { ASN1err(ASN1_F_DO_DUMP, ERR_R_MALLOC_FAILURE); return -1; |