diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-08 11:54:33 -0500 |
|---|---|---|
| committer | Jan Setje-Eilers <73182357+jsetje@users.noreply.github.com> | 2021-03-09 13:52:53 -0800 |
| commit | 1954ef164a55cbc4369f513cca3fb43f3550d81a (patch) | |
| tree | 124965e9d3355c9438d645fa0f1e881fe554fedf /Cryptlib/OpenSSL/crypto/asn1/t_req.c | |
| parent | dddeaf3f7dc8d30640119e999bbfabf4ce068a68 (diff) | |
| download | efi-boot-shim-1954ef164a55cbc4369f513cca3fb43f3550d81a.tar.gz efi-boot-shim-1954ef164a55cbc4369f513cca3fb43f3550d81a.zip | |
Minor OpenSSL fixes
These are all the NULL pointer dereferences (which all appear to be, at
worst, very difficult to hit) that gcc -fanalyzer finds in our OpenSSL
code.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/asn1/t_req.c')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/asn1/t_req.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/asn1/t_req.c b/Cryptlib/OpenSSL/crypto/asn1/t_req.c index 70aba4cc..c32241c2 100644 --- a/Cryptlib/OpenSSL/crypto/asn1/t_req.c +++ b/Cryptlib/OpenSSL/crypto/asn1/t_req.c @@ -195,10 +195,11 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, goto err; if (BIO_puts(bp, ":") <= 0) goto err; - if ((type == V_ASN1_PRINTABLESTRING) || + if (bs != NULL && ( + (type == V_ASN1_PRINTABLESTRING) || (type == V_ASN1_UTF8STRING) || (type == V_ASN1_T61STRING) || - (type == V_ASN1_IA5STRING)) { + (type == V_ASN1_IA5STRING))) { if (BIO_write(bp, (char *)bs->data, bs->length) != bs->length) goto err; |