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

hlsdemux: validate properly utf-8 playlist

Browse source
This commit is contained in:
Andoni Morales Alastruey 2011-04-02 01:21:34 +02:00 committed by Sebastian Dröge
parent 650142f054
commit 650418b9d8
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/hls/gsthlsdemux.c
View file

@ -112,6 +112,7 @@ static gboolean gst_hls_demux_update_playlist (GstHLSDemux * demux,
static void gst_hls_demux_reset (GstHLSDemux * demux, gboolean dispose); static void gst_hls_demux_reset (GstHLSDemux * demux, gboolean dispose);
static gboolean gst_hls_demux_set_location (GstHLSDemux * demux, static gboolean gst_hls_demux_set_location (GstHLSDemux * demux,
const gchar * uri); const gchar * uri);
static gchar *gst_hls_src_buf_to_utf8_playlist (gchar * string, guint size);
static void static void
_do_init (GType type) _do_init (GType type)
@ -342,10 +343,12 @@ gst_hls_demux_sink_event (GstPad * pad, GstEvent * event)
} }
gst_query_unref (query); gst_query_unref (query);
playlist = g_strndup ((gchar *) GST_BUFFER_DATA (demux->playlist), playlist = gst_hls_src_buf_to_utf8_playlist ((gchar *)
GST_BUFFER_SIZE (demux->playlist)); GST_BUFFER_DATA (demux->playlist), GST_BUFFER_SIZE (demux->playlist));
gst_buffer_unref (demux->playlist); gst_buffer_unref (demux->playlist);
if (!gst_m3u8_client_update (demux->client, playlist)) { if (playlist == NULL) {
GST_WARNING_OBJECT (demux, "Error validating first playlist.");
} else if (!gst_m3u8_client_update (demux->client, playlist)) {
/* In most cases, this will happen if we set a wrong url in the /* In most cases, this will happen if we set a wrong url in the
* source element and we have received the 404 HTML response instead of * source element and we have received the 404 HTML response instead of
* the playlist */ * the playlist */
@ -840,9 +843,24 @@ quit:
} }
} }
static gchar *
gst_hls_src_buf_to_utf8_playlist (gchar * data, guint size)
{
gchar *playlist;
if (!g_utf8_validate (data, size, NULL))
return NULL;
/* alloc size + 1 to end with a null character */
playlist = g_malloc0 (size + 1);
memcpy (playlist, data, size + 1);
return playlist;
}
static gboolean static gboolean
gst_hls_demux_update_playlist (GstHLSDemux * demux, gboolean retry) gst_hls_demux_update_playlist (GstHLSDemux * demux, gboolean retry)
{ {
const guint8 *data;
gchar *playlist; gchar *playlist;
guint avail; guint avail;
@ -852,10 +870,14 @@ gst_hls_demux_update_playlist (GstHLSDemux * demux, gboolean retry)
return FALSE; return FALSE;
avail = gst_adapter_available (demux->download); avail = gst_adapter_available (demux->download);
playlist = data = gst_adapter_peek (demux->download, avail);
g_strndup ((gchar *) gst_adapter_peek (demux->download, avail), avail); playlist = gst_hls_src_buf_to_utf8_playlist ((gchar *) data, avail);
gst_m3u8_client_update (demux->client, playlist);
gst_adapter_clear (demux->download); gst_adapter_clear (demux->download);
if (playlist == NULL) {
GST_WARNING_OBJECT (demux, "Couldn't not validate playlist encoding");
return FALSE;
}
gst_m3u8_client_update (demux->client, playlist);
return TRUE; return TRUE;
} }