luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

networkaddress: Return an error from _g_uri_parse_authority()

Browse Source 
So that errors can be propagated if necessary.

https://bugzilla.gnome.org/show_bug.cgi?id=772989
This commit is contained in:
Bastien Nocera 2017-01-03 16:19:56 +01:00 committed by Philip Withnall
parent 88366621ee
commit 5f2c20e88b
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gio/gnetworkaddress.c
View File

@ -489,7 +489,8 @@ gboolean
_g_uri_parse_authority (const char *uri, _g_uri_parse_authority (const char *uri,
char **host, char **host,
guint16 *port, guint16 *port,
char **userinfo) char **userinfo,
GError **error)
{ {
char *tmp_str; char *tmp_str;
const char *start, *p, *at, *delim; const char *start, *p, *at, *delim;
@ -517,7 +518,7 @@ _g_uri_parse_authority (const char *uri,
tmp_str = g_uri_parse_scheme (uri); tmp_str = g_uri_parse_scheme (uri);
if (tmp_str == NULL) if (tmp_str == NULL)
return FALSE; goto error;
g_free (tmp_str); g_free (tmp_str);
@ -528,7 +529,7 @@ _g_uri_parse_authority (const char *uri,
start = strstr (p, "//"); start = strstr (p, "//");
if (start == NULL) if (start == NULL)
return FALSE; goto error;
start += 2; start += 2;
@ -559,7 +560,7 @@ _g_uri_parse_authority (const char *uri,
{ {
if (!(g_ascii_isxdigit (p[0]) || if (!(g_ascii_isxdigit (p[0]) ||
g_ascii_isxdigit (p[1]))) g_ascii_isxdigit (p[1])))
return FALSE; goto error;
p++; p++;
@ -571,7 +572,7 @@ _g_uri_parse_authority (const char *uri,
strchr (G_URI_OTHER_UNRESERVED, c) || strchr (G_URI_OTHER_UNRESERVED, c) ||
strchr (G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, c) || strchr (G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, c) ||
c == ':')) c == ':'))
return FALSE; goto error;
} }
if (userinfo) if (userinfo)
@ -618,7 +619,7 @@ _g_uri_parse_authority (const char *uri,
strchr (G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, c) || strchr (G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, c) ||
c == ':' || c == ':' ||
c == '.')) c == '.'))
goto error; goto error;
} }
if (host) if (host)
@ -649,7 +650,7 @@ _g_uri_parse_authority (const char *uri,
{ {
if (!(g_ascii_isxdigit (p[0]) || if (!(g_ascii_isxdigit (p[0]) ||
g_ascii_isxdigit (p[1]))) g_ascii_isxdigit (p[1])))
goto error; goto error;
p++; p++;
@ -660,7 +661,7 @@ _g_uri_parse_authority (const char *uri,
if (!(g_ascii_isalnum (c) || if (!(g_ascii_isalnum (c) ||
strchr (G_URI_OTHER_UNRESERVED, c) || strchr (G_URI_OTHER_UNRESERVED, c) ||
strchr (G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, c))) strchr (G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, c)))
goto error; goto error;
} }
if (host) if (host)
@ -685,7 +686,7 @@ _g_uri_parse_authority (const char *uri,
break; break;
if (!g_ascii_isdigit (c)) if (!g_ascii_isdigit (c))
goto error; goto error;
tmp = (tmp * 10) + (c - '0'); tmp = (tmp * 10) + (c - '0');
@ -699,6 +700,9 @@ _g_uri_parse_authority (const char *uri,
return TRUE; return TRUE;
error: error:
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
"Invalid URI ‘%s’", uri);
if (host && *host) if (host && *host)
{ {
g_free (*host); g_free (*host);
@ -782,13 +786,8 @@ g_network_address_parse_uri (const gchar *uri,
gchar *hostname; gchar *hostname;
guint16 port; guint16 port;
if (!_g_uri_parse_authority (uri, &hostname, &port, NULL)) if (!_g_uri_parse_authority (uri, &hostname, &port, NULL, error))
{ return NULL;
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
"Invalid URI '%s'",
uri);
return NULL;
}
if (port == 0) if (port == 0)
port = default_port; port = default_port;

3
gio/gnetworkingprivate.h
View File

@ -26,7 +26,8 @@ G_BEGIN_DECLS
gboolean _g_uri_parse_authority (const char *uri, gboolean _g_uri_parse_authority (const char *uri,
char **host, char **host,
guint16 *port, guint16 *port,
char **userinfo); char **userinfo,
GError **error);
gchar * _g_uri_from_authority (const gchar *protocol, gchar * _g_uri_from_authority (const gchar *protocol,
const gchar *host, const gchar *host,
guint port, guint port,

2
gio/gproxyaddressenumerator.c
View File

@ -93,7 +93,7 @@ save_userinfo (GProxyAddressEnumeratorPrivate *priv,
priv->proxy_password = NULL; priv->proxy_password = NULL;
} }
if (_g_uri_parse_authority (proxy, NULL, NULL, &userinfo)) if (_g_uri_parse_authority (proxy, NULL, NULL, &userinfo, NULL))
{ {
if (userinfo) if (userinfo)
{ {

2
gio/gsimpleproxyresolver.c
View File

@ -329,7 +329,7 @@ g_simple_proxy_resolver_lookup (GProxyResolver *proxy_resolver,
gchar *host = NULL; gchar *host = NULL;
gushort port; gushort port;
if (_g_uri_parse_authority (uri, &host, &port, NULL) && if (_g_uri_parse_authority (uri, &host, &port, NULL, NULL) &&
ignore_host (resolver, host, port)) ignore_host (resolver, host, port))
proxy = "direct://"; proxy = "direct://";