[Spice-devel] [PATCH spice-gtk v2 4/5] spice-uri: Do not allow empty port string

[Pavel Grunt]

Related: rhbz#1335239
---
 src/spice-uri.c        | 3 +++
 tests/test-spice-uri.c | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/spice-uri.c b/src/spice-uri.c
index 35d773e..5eca422 100644
--- a/src/spice-uri.c
+++ b/src/spice-uri.c
@@ -167,6 +167,9 @@ gboolean spice_uri_parse(SpiceURI *self, const gchar *_uri, GError **error)
             g_set_error(error, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_FAILED,
                         "Invalid uri port: %s", uri_port);
             goto end;
+        } else if (endptr == uri_port) {
+            g_set_error(error, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_FAILED, "Missing uri port");
+            goto end;
         }
         spice_uri_set_port(self, port);
     }
diff --git a/tests/test-spice-uri.c b/tests/test-spice-uri.c
index 3d21fa7..c98f4da 100644
--- a/tests/test-spice-uri.c
+++ b/tests/test-spice-uri.c
@@ -34,6 +34,7 @@ static void test_spice_uri_ipv4(void)
         {"http://:80", "http", NULL, 80, NULL, NULL}, /* missing hostname */
         {"http://", "http", NULL, 3128, NULL, NULL},
         {"http://127.0.0.1:port", "http", "127.0.0.1", 3128, NULL, NULL}, /* invalid port */
+        {"http://127.0.0.1:", "http", "127.0.0.1", 3128, NULL, NULL},
     };
     const struct test_case valid_test_cases[] = {
         {"http://user:password@host:80", "http", "host", 80, "user", "password"},
-- 
2.8.2