summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-05-02 16:50:01 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-05-02 18:37:25 +0100
commit769e3edbe0f658ecaf22d7352486aad176095328 (patch)
tree928eebce4445c700bd0ed67fd41210327e57941e
parenteda37dbc3f547d785e4e8941abd320d1292e93e7 (diff)
downloadglib-769e3edbe0f658ecaf22d7352486aad176095328.tar.gz
glib-769e3edbe0f658ecaf22d7352486aad176095328.tar.bz2
glib-769e3edbe0f658ecaf22d7352486aad176095328.zip
GSocks5Proxy: don't crash if parsing negotiation reply fails
The GError should be initialized to NULL, otherwise we'll "pile up" errors, then try to free an uninitialized pointer. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugzilla.gnome.org/show_bug.cgi?id=699493
-rw-r--r--gio/gsocks5proxy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gio/gsocks5proxy.c b/gio/gsocks5proxy.c
index 9d9055ffa..0d6269e3b 100644
--- a/gio/gsocks5proxy.c
+++ b/gio/gsocks5proxy.c
@@ -708,7 +708,7 @@ nego_reply_read_cb (GObject *source,
if (data->offset == data->length)
{
- GError *error;
+ GError *error = NULL;
gboolean must_auth = FALSE;
gboolean has_auth = data->username || data->password;