debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't pass NULL to soup_uri_new and free the proxy string properly

Browse source
This commit is contained in:
Christian Dywan 2008-12-09 00:25:59 +01:00
parent aeb71dd7b4
commit 108954273a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/main.c
View file

@ -1441,6 +1441,7 @@ soup_session_constructed_cb (GObject* object)
MidoriApp* app; MidoriApp* app;
MidoriWebSettings* settings; MidoriWebSettings* settings;
SoupSession* session; SoupSession* session;
gchar* http_proxy;
SoupURI* proxy_uri; SoupURI* proxy_uri;
if (old_session_constructed_cb) if (old_session_constructed_cb)
@ -1448,7 +1449,10 @@ soup_session_constructed_cb (GObject* object)
app = g_type_get_qdata (SOUP_TYPE_SESSION, app = g_type_get_qdata (SOUP_TYPE_SESSION,
g_quark_from_static_string ("midori-app")); g_quark_from_static_string ("midori-app"));
settings = katze_object_get_object (app, "settings"); settings = katze_object_get_object (app, "settings");
proxy_uri = soup_uri_new (katze_object_get_string (settings, "http-proxy")); http_proxy = katze_object_get_string (settings, "http-proxy");
/* soup_uri_new expects a non-NULL string */
proxy_uri = soup_uri_new (http_proxy ? http_proxy : "");
g_free (http_proxy);
g_object_set (object, g_object_set (object,
"user-agent", katze_object_get_string (settings, "ident-string"), "user-agent", katze_object_get_string (settings, "ident-string"),
"proxy-uri", proxy_uri, "proxy-uri", proxy_uri,