From 5b4d38b29b6b69a0cab20e094727b3ba2055d761 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 17 Jul 2014 15:20:38 +0100 Subject: stop using certificate data from the stack outside the message context. --- desktop/sslcert_viewer.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'desktop') diff --git a/desktop/sslcert_viewer.c b/desktop/sslcert_viewer.c index 20b90bf6c..5280e094a 100644 --- a/desktop/sslcert_viewer.c +++ b/desktop/sslcert_viewer.c @@ -47,7 +47,7 @@ enum sslcert_viewer_field { /** ssl certificate verification context. */ struct sslcert_session_data { - const struct ssl_cert_info *certs; /**< Certificates */ + struct ssl_cert_info *certs; /**< Certificates */ unsigned long num; /**< Number of certificates in chain */ nsurl *url; /**< The url of the certificate */ llcache_query_response cb; /**< Cert accept/reject callback */ @@ -394,8 +394,15 @@ static void sslcert_cleanup_session(struct sslcert_session_data *ssl_d) { assert(ssl_d != NULL); - if (ssl_d->url) + if (ssl_d->url) { nsurl_unref(ssl_d->url); + ssl_d->url = NULL; + } + + if (ssl_d->certs) { + free(ssl_d->certs); + ssl_d->certs = NULL; + } free(ssl_d); } @@ -439,12 +446,19 @@ nserror sslcert_viewer_create_session_data(unsigned long num, nsurl *url, data = malloc(sizeof(struct sslcert_session_data)); if (data == NULL) { - warn_user("NoMemory", 0); *ssl_d = NULL; return NSERROR_NOMEM; } - data->certs = certs; + /* copy certificate data */ + data->certs = malloc(num * sizeof(struct ssl_cert_info)); + if (data->certs == NULL) { + free(data); + *ssl_d = NULL; + return NSERROR_NOMEM; + } + memcpy(data->certs, certs, num * sizeof(struct ssl_cert_info)); + data->url = nsurl_ref(url); data->num = num; data->cb = cb; -- cgit v1.2.3