denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnscert: Properly free enumerated certificates

Browse Source
This commit is contained in:
Tobias Brunner
2016-09-20 15:36:15 +02:00
parent 15cbe526ac
commit 149b7de35c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/dnscert/dnscert_cred.c
+11 -8
View File
@@ -70,6 +70,8 @@ typedef struct {
enumerator_t *inner; enumerator_t *inner;
/** response of the DNS resolver which contains the CERTs */ /** response of the DNS resolver which contains the CERTs */
resolver_response_t *response; resolver_response_t *response;
/** most recently enumerated certificate */
certificate_t *cert;
} cert_enumerator_t; } cert_enumerator_t;
METHOD(enumerator_t, cert_enumerator_enumerate, bool, METHOD(enumerator_t, cert_enumerator_enumerate, bool,
@@ -101,17 +103,17 @@ METHOD(enumerator_t, cert_enumerator_enumerate, bool,
/* Try to parse PEM certificate container. Both x509 and PGP should /* Try to parse PEM certificate container. Both x509 and PGP should
* presumably come as PEM encoded certs. */ * presumably come as PEM encoded certs. */
certificate = cur_crt->get_certificate(cur_crt); certificate = cur_crt->get_certificate(cur_crt);
*cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_ANY, DESTROY_IF(this->cert);
BUILD_BLOB_PEM, certificate, this->cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_ANY,
BUILD_END); BUILD_BLOB_PEM, certificate,
if (*cert == NULL) BUILD_END);
cur_crt->destroy(cur_crt);
if (!this->cert)
{ {
DBG1(DBG_CFG, " unable to parse certificate, skipping", DBG1(DBG_CFG, " unable to parse certificate, skipping");
cur_crt->get_cert_type(cur_crt));
cur_crt->destroy(cur_crt);
continue; continue;
} }
cur_crt->destroy(cur_crt); *cert = this->cert;
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@@ -120,6 +122,7 @@ METHOD(enumerator_t, cert_enumerator_enumerate, bool,
METHOD(enumerator_t, cert_enumerator_destroy, void, METHOD(enumerator_t, cert_enumerator_destroy, void,
cert_enumerator_t *this) cert_enumerator_t *this)
{ {
DESTROY_IF(this->cert);
this->inner->destroy(this->inner); this->inner->destroy(this->inner);
this->response->destroy(this->response); this->response->destroy(this->response);
free(this); free(this);