mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gsturi.c: Be more liberal in what URIs we accept.

Browse source 
Original commit message from CVS:
* gst/gsturi.c:
Be more liberal in what URIs we accept.
Do not unescape bits of the URI for no apparent reason before passing to
the element. Fixes #545352.
This commit is contained in:
Michael Smith 2008-07-31 17:16:50 +00:00
parent 1695ddb9dd
commit 26b51b2d9c
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-07-31 Michael Smith <msmith@songbirdnest.com>
* gst/gsturi.c:
Be more liberal in what URIs we accept.
Do not unescape bits of the URI for no apparent reason before passing to
the element. Fixes #545352.
2008-07-31 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-07-31 Sebastian Dröge <sebastian.droege@collabora.co.uk>
Patch by: Robert Schwebel <r.schwebel@pengutronix.de> Patch by: Robert Schwebel <r.schwebel@pengutronix.de>

17
gst/gsturi.c
View file

@ -336,7 +336,7 @@ gst_uri_protocol_is_valid (const gchar * protocol)
* @uri: A URI string * @uri: A URI string
* *
* Tests if the given string is a valid URI identifier. URIs start with a valid * Tests if the given string is a valid URI identifier. URIs start with a valid
* protocol followed by "://" and maybe a string identifying the location. * scheme followed by ":" and maybe a string identifying the location.
* *
* Returns: TRUE if the string is a valid URI * Returns: TRUE if the string is a valid URI
*/ */
@ -349,7 +349,7 @@ gst_uri_is_valid (const gchar * uri)
gst_uri_protocol_check_internal (uri, &endptr); gst_uri_protocol_check_internal (uri, &endptr);
return (*endptr == ':' && *(endptr + 1) == '/' && *(endptr + 2) == '/'); return *endptr == ':';
} }
/** /**
@ -369,7 +369,7 @@ gst_uri_get_protocol (const gchar * uri)
g_return_val_if_fail (uri != NULL, NULL); g_return_val_if_fail (uri != NULL, NULL);
g_return_val_if_fail (gst_uri_is_valid (uri), NULL); g_return_val_if_fail (gst_uri_is_valid (uri), NULL);
colon = strstr (uri, "://"); colon = strstr (uri, ":");
return g_ascii_strdown (uri, colon - uri); return g_ascii_strdown (uri, colon - uri);
} }
@ -394,7 +394,7 @@ gst_uri_has_protocol (const gchar * uri, const gchar * protocol)
g_return_val_if_fail (protocol != NULL, FALSE); g_return_val_if_fail (protocol != NULL, FALSE);
g_return_val_if_fail (gst_uri_is_valid (uri), FALSE); g_return_val_if_fail (gst_uri_is_valid (uri), FALSE);
colon = strstr (uri, "://"); colon = strstr (uri, ":");
if (colon == NULL) if (colon == NULL)
return FALSE; return FALSE;
@ -721,7 +721,7 @@ gst_uri_handler_set_uri (GstURIHandler * handler, const gchar * uri)
{ {
GstURIHandlerInterface *iface; GstURIHandlerInterface *iface;
gboolean ret; gboolean ret;
gchar *new_uri, *protocol, *location; gchar *new_uri, *protocol, *location, *colon;
g_return_val_if_fail (GST_IS_URI_HANDLER (handler), FALSE); g_return_val_if_fail (GST_IS_URI_HANDLER (handler), FALSE);
g_return_val_if_fail (gst_uri_is_valid (uri), FALSE); g_return_val_if_fail (gst_uri_is_valid (uri), FALSE);
@ -731,8 +731,11 @@ gst_uri_handler_set_uri (GstURIHandler * handler, const gchar * uri)
g_return_val_if_fail (iface->set_uri != NULL, FALSE); g_return_val_if_fail (iface->set_uri != NULL, FALSE);
protocol = gst_uri_get_protocol (uri); protocol = gst_uri_get_protocol (uri);
location = gst_uri_get_location (uri);
new_uri = g_strdup_printf ("%s://%s", protocol, location); colon = strstr (uri, ":");
location = g_strdup (colon);
new_uri = g_strdup_printf ("%s%s", protocol, location);
ret = iface->set_uri (handler, uri); ret = iface->set_uri (handler, uri);