mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-02 15:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

stop using certificate data from the stack outside the message context.

Browse Source
This commit is contained in:
Vincent Sanders 2014-07-17 15:20:38 +01:00
parent db01637343
commit 5b4d38b29b
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desktop/sslcert_viewer.c
View File

@ -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;

13
gtk/gui.c
View File

@ -653,10 +653,18 @@ static void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
GError* error = NULL;
GtkBuilder* builder;
/* state while window is open */
session = calloc(sizeof(void *), 3);
if (session == NULL) {
return;
}
builder = gtk_builder_new ();
if (!gtk_builder_add_from_file(builder, glade_file_location->ssl, &error)) {
g_warning("Couldn't load builder file: %s", error->message);
g_error_free(error);
free(session);
return;
}
@ -667,11 +675,6 @@ static void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
scrolled = GTK_SCROLLED_WINDOW(gtk_builder_get_object(builder, "SSLScrolled"));
drawing_area = GTK_DRAWING_AREA(gtk_builder_get_object(builder, "SSLDrawingArea"));
session = calloc(sizeof(void *), 3);
if (session == NULL) {
return;
}
ssl_window = nsgtk_treeview_create(TREE_SSLCERT, window, scrolled,
drawing_area);