summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorin Apostol <florin.apostol@oregan.net>2016-02-23 10:49:40 +0000
committerSebastian Dröge <sebastian@centricular.com>2016-02-23 14:41:35 +0200
commit72e46a447818a484e24caeecd33915612e4b0be8 (patch)
treed22fe5924011cbb6204d3b23bb7a8420fa32fdbc
parentc0e930c26f2a64fe1cac3cfc1a641a8a564ac6fa (diff)
dashdemux: correctly handle an HTTP-XSDATE that is exactly the size of the date string
The code in the gst_dash_demux_parse_http_xsdate() was trying to handle the case where the string is not null terminated by resizing the buffer and appending a zero byte. This does not work if the buffer is exactly the length of the string because the gst_buffer_resize() function does not re-allocate the buffer, it just changes its size. If a buffer is passed to gst_dash_demux_parse_http_xsdate() that is exactly the length of the string, the function fails with an assert failure in gst_buffer_resize(). https://bugzilla.gnome.org/show_bug.cgi?id=762148
-rw-r--r--ext/dash/gstdashdemux.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/ext/dash/gstdashdemux.c b/ext/dash/gstdashdemux.c
index 9bbc5ae03..4c1f999c9 100644
--- a/ext/dash/gstdashdemux.c
+++ b/ext/dash/gstdashdemux.c
@@ -1992,15 +1992,17 @@ static GstDateTime *
gst_dash_demux_parse_http_xsdate (GstDashDemuxClockDrift * clock_drift,
GstBuffer * buffer)
{
- GstDateTime *value;
+ GstDateTime *value = NULL;
GstMapInfo mapinfo;
/* the string from the server might not be zero terminated */
- gst_buffer_resize (buffer, 0, gst_buffer_get_size (buffer) + 1);
- gst_buffer_map (buffer, &mapinfo, GST_MAP_READ | GST_MAP_WRITE);
- mapinfo.data[mapinfo.size - 1] = '\0';
- value = gst_date_time_new_from_iso8601_string ((const gchar *) mapinfo.data);
- gst_buffer_unmap (buffer, &mapinfo);
+ if (gst_buffer_map (buffer, &mapinfo, GST_MAP_READ)) {
+ gchar *str;
+ str = g_strndup ((const gchar *) mapinfo.data, mapinfo.size);
+ gst_buffer_unmap (buffer, &mapinfo);
+ value = gst_date_time_new_from_iso8601_string (str);
+ g_free (str);
+ }
return value;
}