|
 |
07d9f9 |
From 92a12ce39b7b49ab4f992066dcafeab98680232f Mon Sep 17 00:00:00 2001
|
|
|
07d9f9 |
From: Pavel Grunt <pgrunt@redhat.com>
|
|
|
07d9f9 |
Date: Wed, 1 Jun 2016 10:04:45 +0200
|
|
|
07d9f9 |
Subject: [PATCH 09/15] spice-uri: Reset SpiceURI before parsing
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Avoid using old values after parsing a new uri.
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Related: rhbz#1335239
|
|
|
07d9f9 |
(cherry picked from commit 024eccefba506f57fbff837c6d75864c51ed2add)
|
|
|
07d9f9 |
---
|
|
|
07d9f9 |
src/spice-uri.c | 17 +++++++++++++----
|
|
|
07d9f9 |
tests/uri.c | 1 +
|
|
|
07d9f9 |
2 files changed, 14 insertions(+), 4 deletions(-)
|
|
|
07d9f9 |
|
|
|
07d9f9 |
diff --git a/src/spice-uri.c b/src/spice-uri.c
|
|
|
07d9f9 |
index e2c5c9a..1684328 100644
|
|
|
07d9f9 |
--- a/src/spice-uri.c
|
|
|
07d9f9 |
+++ b/src/spice-uri.c
|
|
|
07d9f9 |
@@ -68,6 +68,15 @@ SpiceURI* spice_uri_new(void)
|
|
|
07d9f9 |
return self;
|
|
|
07d9f9 |
}
|
|
|
07d9f9 |
|
|
|
07d9f9 |
+static void spice_uri_reset(SpiceURI *self)
|
|
|
07d9f9 |
+{
|
|
|
07d9f9 |
+ g_clear_pointer(&self->scheme, g_free);
|
|
|
07d9f9 |
+ g_clear_pointer(&self->hostname, g_free);
|
|
|
07d9f9 |
+ g_clear_pointer(&self->user, g_free);
|
|
|
07d9f9 |
+ g_clear_pointer(&self->password, g_free);
|
|
|
07d9f9 |
+ self->port = 0;
|
|
|
07d9f9 |
+}
|
|
|
07d9f9 |
+
|
|
|
07d9f9 |
G_GNUC_INTERNAL
|
|
|
07d9f9 |
gboolean spice_uri_parse(SpiceURI *self, const gchar *_uri, GError **error)
|
|
|
07d9f9 |
{
|
|
|
07d9f9 |
@@ -76,6 +85,9 @@ gboolean spice_uri_parse(SpiceURI *self, const gchar *_uri, GError **error)
|
|
|
07d9f9 |
size_t len;
|
|
|
07d9f9 |
|
|
|
07d9f9 |
g_return_val_if_fail(self != NULL, FALSE);
|
|
|
07d9f9 |
+
|
|
|
07d9f9 |
+ spice_uri_reset(self);
|
|
|
07d9f9 |
+
|
|
|
07d9f9 |
g_return_val_if_fail(_uri != NULL, FALSE);
|
|
|
07d9f9 |
|
|
|
07d9f9 |
uri = dup = g_strdup(_uri);
|
|
|
07d9f9 |
@@ -304,10 +316,7 @@ static void spice_uri_finalize(GObject* obj)
|
|
|
07d9f9 |
SpiceURI *self;
|
|
|
07d9f9 |
|
|
|
07d9f9 |
self = G_TYPE_CHECK_INSTANCE_CAST(obj, SPICE_TYPE_URI, SpiceURI);
|
|
|
07d9f9 |
- g_free(self->scheme);
|
|
|
07d9f9 |
- g_free(self->hostname);
|
|
|
07d9f9 |
- g_free(self->user);
|
|
|
07d9f9 |
- g_free(self->password);
|
|
|
07d9f9 |
+ spice_uri_reset(self);
|
|
|
07d9f9 |
|
|
|
07d9f9 |
G_OBJECT_CLASS (spice_uri_parent_class)->finalize (obj);
|
|
|
07d9f9 |
}
|
|
|
07d9f9 |
diff --git a/tests/uri.c b/tests/uri.c
|
|
|
07d9f9 |
index b68f159..d57f072 100644
|
|
|
07d9f9 |
--- a/tests/uri.c
|
|
|
07d9f9 |
+++ b/tests/uri.c
|
|
|
07d9f9 |
@@ -87,6 +87,7 @@ static void test_spice_uri_ipv4_good(void)
|
|
|
07d9f9 |
{"https://127.0.0.1", "https", "127.0.0.1", 3129, NULL, NULL, NULL},
|
|
|
07d9f9 |
{"127.0.0.1", "http", "127.0.0.1", 3128, NULL, NULL, NULL},
|
|
|
07d9f9 |
{"http://user:password@host:80", "http", "host", 80, "user", "password", NULL},
|
|
|
07d9f9 |
+ {"https://host:42", "https", "host", 42, NULL, NULL, NULL}, /* tests resetting of username & password */
|
|
|
07d9f9 |
};
|
|
|
07d9f9 |
|
|
|
07d9f9 |
test_spice_uri_good(valid_test_cases, G_N_ELEMENTS(valid_test_cases));
|
|
|
07d9f9 |
--
|
|
|
07d9f9 |
2.5.5
|
|
|
07d9f9 |
|