mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtc, rtmp2: Fix parsing of userinfo in URI strings

Browse source 
While parsing the string, `gst_uri_from_string()` also unescapes the
userinfo. This is bad if your username contains a `:` character, since
we will then split the userinfo at the wrong location when parsing it.

To fix this, we can use the new `gst_uri_from_string_escaped()` API
that was added in
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/583

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/831

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1481>
This commit is contained in:
Nirbheek Chauhan 2020-08-01 02:12:21 +05:30
parent 962ebebe06
commit 827afa206d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/webrtc/gstwebrtcice.c
View file

@ -780,7 +780,7 @@ _clear_ice_stream (struct NiceStreamItem *item)
static GstUri * static GstUri *
_validate_turn_server (GstWebRTCICE * ice, const gchar * s) _validate_turn_server (GstWebRTCICE * ice, const gchar * s)
{ {
GstUri *uri = gst_uri_from_string (s); GstUri *uri = gst_uri_from_string_escaped (s);
const gchar *userinfo, *scheme; const gchar *userinfo, *scheme;
GList *keys = NULL, *l; GList *keys = NULL, *l;
gchar *user = NULL, *pass = NULL; gchar *user = NULL, *pass = NULL;
@ -855,7 +855,7 @@ out:
void void
gst_webrtc_ice_set_stun_server (GstWebRTCICE * ice, const gchar * uri_s) gst_webrtc_ice_set_stun_server (GstWebRTCICE * ice, const gchar * uri_s)
{ {
GstUri *uri = gst_uri_from_string (uri_s); GstUri *uri = gst_uri_from_string_escaped (uri_s);
const gchar *msg = "must be of the form stun://<host>:<port>"; const gchar *msg = "must be of the form stun://<host>:<port>";
GST_DEBUG_OBJECT (ice, "setting stun server, %s", uri_s); GST_DEBUG_OBJECT (ice, "setting stun server, %s", uri_s);

2
gst/rtmp2/gstrtmp2locationhandler.c
View file

@ -165,7 +165,7 @@ uri_handler_set_uri (GstURIHandler * handler, const gchar * string,
{ {
gchar *string_without_path = g_strndup (string, path_sep - string); gchar *string_without_path = g_strndup (string, path_sep - string);
uri = gst_uri_from_string (string_without_path); uri = gst_uri_from_string_escaped (string_without_path);
g_free (string_without_path); g_free (string_without_path);
} }