diff options
| -rw-r--r-- | plugins/proxy/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/proxy/proxy.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/proxy/ChangeLog b/plugins/proxy/ChangeLog index 34edb99542..bea51d3d30 100644 --- a/plugins/proxy/ChangeLog +++ b/plugins/proxy/ChangeLog @@ -1,3 +1,9 @@ +2005-07-14 Vivek Jain <jvivek@novell.com> + + * proxy.c: (proxy_commit),(proxy_abort): + NULL checks before we do anything else here (quite likely to be NULL) + **Fixes #310347 + 2005-07-13 Tor Lillqvist <tml@novell.com> * Makefile.am (LIBADD): Link with libeutil. diff --git a/plugins/proxy/proxy.c b/plugins/proxy/proxy.c index 9299c6685f..4f9d5f31ef 100644 --- a/plugins/proxy/proxy.c +++ b/plugins/proxy/proxy.c @@ -488,6 +488,9 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data) account = target_account->account; prd = g_object_get_data ((GObject *)account, "prd"); proxy_list = (GList *) g_object_get_data ((GObject *) account, "proxy_dialog"); + + if (prd == NULL || proxy_list == NULL) + return; g_list_foreach (proxy_list, (GFunc) free_proxy_handler, NULL); g_list_free (proxy_list); @@ -507,9 +510,12 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data) target_account = (EMConfigTargetAccount *)data->config->target; account = target_account->account; prd = g_object_get_data ((GObject *)account, "prd"); - priv = prd->priv; l = g_object_get_data ( (GObject *)account, "proxy_list") ; + if (prd == NULL || l == NULL) + return; + + priv = prd->priv; for (;l; l = g_list_next (l)) { aclInstance = (proxyHandler *) l->data; |