diff options
| author | David Benjamin <davidben@google.com> | 2022-12-16 10:25:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 10:25:14 -0500 |
| commit | 4aae795360be0f8f85df32348bf1a6679b6828ca (patch) | |
| tree | c2bcdaf0acfbc5812dc55cdce74857483c28ada0 | |
| parent | 1cafac4d8fc5301d4e58bedbac45722bf7cdfd32 (diff) | |
| download | pyopenssl-4aae795360be0f8f85df32348bf1a6679b6828ca.tar.gz | |
Fix some memory leaks in CRL.export (#1170)
The bio was never freed, or used. sometime is never freed. While I'm
here, check return values for all the functions called here.
| -rw-r--r-- | src/OpenSSL/crypto.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py index 4d7d03a..3224103 100644 --- a/src/OpenSSL/crypto.py +++ b/src/OpenSSL/crypto.py @@ -2502,23 +2502,26 @@ class CRL: if digest_obj == _ffi.NULL: raise ValueError("No such digest method") - bio = _lib.BIO_new(_lib.BIO_s_mem()) - _openssl_assert(bio != _ffi.NULL) - # A scratch time object to give different values to different CRL # fields sometime = _lib.ASN1_TIME_new() _openssl_assert(sometime != _ffi.NULL) + sometime = _ffi.gc(sometime, _lib.ASN1_TIME_free) - _lib.X509_gmtime_adj(sometime, 0) - _lib.X509_CRL_set1_lastUpdate(self._crl, sometime) + ret = _lib.X509_gmtime_adj(sometime, 0) + _openssl_assert(ret != _ffi.NULL) + ret = _lib.X509_CRL_set1_lastUpdate(self._crl, sometime) + _openssl_assert(ret == 1) - _lib.X509_gmtime_adj(sometime, days * 24 * 60 * 60) - _lib.X509_CRL_set1_nextUpdate(self._crl, sometime) + ret = _lib.X509_gmtime_adj(sometime, days * 24 * 60 * 60) + _openssl_assert(ret != _ffi.NULL) + ret = _lib.X509_CRL_set1_nextUpdate(self._crl, sometime) + _openssl_assert(ret == 1) - _lib.X509_CRL_set_issuer_name( + ret = _lib.X509_CRL_set_issuer_name( self._crl, _lib.X509_get_subject_name(cert._x509) ) + _openssl_assert(ret == 1) sign_result = _lib.X509_CRL_sign(self._crl, key._pkey, digest_obj) if not sign_result: |