From 06d9bae9cdcba064e54f444e121695a44eb79402 Mon Sep 17 00:00:00 2001 From: Emmanuel Rodriguez Date: Thu, 19 Mar 2009 08:25:48 +0200 Subject: [PATCH] Fix Bug 575902: ChamplainNetworkMapSource crashes when setting "proxy-uri" --- champlain/champlain-network-map-source.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/champlain/champlain-network-map-source.c b/champlain/champlain-network-map-source.c index bad8165..e335d37 100644 --- a/champlain/champlain-network-map-source.c +++ b/champlain/champlain-network-map-source.c @@ -114,8 +114,7 @@ champlain_network_map_source_set_property (GObject *object, priv->offline = g_value_get_boolean (value); break; case PROP_PROXY_URI: - if (priv->proxy_uri) - g_free (priv->proxy_uri); + g_free (priv->proxy_uri); priv->proxy_uri = g_value_dup_string (value); if (soup_session) @@ -130,9 +129,11 @@ champlain_network_map_source_set_property (GObject *object, static void champlain_network_map_source_finalize (GObject *object) { - /* ChamplainNetworkMapSource *network_map_source = CHAMPLAIN_NETWORK_MAP_SOURCE (object); - * ChamplainNetworkMapSourcePrivate *priv = GET_PRIVATE (network_map_source); - */ + ChamplainNetworkMapSource *network_map_source = CHAMPLAIN_NETWORK_MAP_SOURCE (object); + ChamplainNetworkMapSourcePrivate *priv = GET_PRIVATE (network_map_source); + + g_free (priv->proxy_uri); + g_free (priv->uri_format); G_OBJECT_CLASS (champlain_network_map_source_parent_class)->finalize (object); } @@ -200,7 +201,8 @@ champlain_network_map_source_init (ChamplainNetworkMapSource *champlainMapSource { ChamplainNetworkMapSourcePrivate *priv = GET_PRIVATE (champlainMapSource); - priv->proxy_uri = ""; + priv->proxy_uri = g_strdup (""); + priv->uri_format = NULL; } ChamplainNetworkMapSource* -- 2.39.5