diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2014-06-07 14:08:51 +0200 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2014-06-07 14:11:14 +0200 |
| commit | 3a2c8e62dd0bee619f9b658d8beadcacd1dda42a (patch) | |
| tree | 273c1e9b15f62f66bf1cd97739a0947711342a09 | |
| parent | b6282eda59717e61f3af54200fe7c58ead5d7adc (diff) | |
| download | lasso-3a2c8e62dd0bee619f9b658d8beadcacd1dda42a.tar.gz lasso-3a2c8e62dd0bee619f9b658d8beadcacd1dda42a.tar.xz lasso-3a2c8e62dd0bee619f9b658d8beadcacd1dda42a.zip | |
saml-2.0/server: fix invalid memory access
GList must never be allocated through malloc as it internally managed
using gslice. Always use Glib constructors and methods.
| -rw-r--r-- | lasso/saml-2.0/server.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lasso/saml-2.0/server.c b/lasso/saml-2.0/server.c index 0d157cc8..9abe3206 100644 --- a/lasso/saml-2.0/server.c +++ b/lasso/saml-2.0/server.c @@ -145,12 +145,8 @@ lasso_saml20_server_load_metadata_entity(LassoServer *server, LassoProviderRole lasso_release_gobject(provider); return LASSO_SERVER_ERROR_NO_PROVIDER_LOADED; } - if (*loaded_end) { - GList *l = *loaded_end; - l->next = g_new0(GList, 1); - l->next->prev = l; - l->next->data = g_strdup(name); - *loaded_end = l->next; + if (loaded_end) { + *loaded_end = g_list_prepend(*loaded_end, g_strdup(name)); } g_hash_table_insert(server->providers, g_strdup(name), provider); return 0; @@ -243,17 +239,18 @@ lasso_saml20_server_load_metadata(LassoServer *server, LassoProviderRole role, xmlSecKeysMngr *keys_mngr, LassoServerLoadMetadataFlag flags) { lasso_error_t rc = 0; - GList loaded = { .data = NULL, .next = NULL }; - GList *loaded_end = NULL; + GList *loaded = NULL; + GList **loaded_end = NULL; if (loaded_entity_ids) { loaded_end = &loaded; } rc = lasso_saml20_server_load_metadata_child(server, role, - doc, root_node, blacklisted_entity_ids, &loaded_end, keys_mngr, flags); + doc, root_node, blacklisted_entity_ids, loaded_end, keys_mngr, flags); if (loaded_entity_ids) { + loaded = g_list_reverse(loaded); lasso_release_list_of_strings(*loaded_entity_ids); - *loaded_entity_ids = loaded.next; + *loaded_entity_ids = loaded; } return rc; } |