mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-19 05:45:58 +00:00
dashdemux: corrected parsing of negative values into unsigned data
https://bugzilla.gnome.org/show_bug.cgi?id=752429
This commit is contained in:
Florin Apostol
Vincent Penquerc'h
parent
d054a6918c
commit
7c2746f741
2 changed files with 130 additions and 12 deletions
|
|
@ -385,13 +385,16 @@ gst_mpdparser_get_xml_prop_unsigned_integer (xmlNode * a_node,
|
|||
*property_value = default_val;
|
||||
prop_string = xmlGetProp (a_node, (const xmlChar *) property_name);
|
||||
if (prop_string) {
|
||||
if (sscanf ((gchar *) prop_string, "%u", property_value) == 1) {
|
||||
if (sscanf ((gchar *) prop_string, "%u", property_value) == 1 &&
|
||||
strstr ((gchar *) prop_string, "-") == NULL) {
|
||||
exists = TRUE;
|
||||
GST_LOG (" - %s: %u", property_name, *property_value);
|
||||
} else {
|
||||
GST_WARNING
|
||||
("failed to parse unsigned integer property %s from xml string %s",
|
||||
property_name, prop_string);
|
||||
/* sscanf might have written to *property_value. Restore to default */
|
||||
*property_value = default_val;
|
||||
}
|
||||
xmlFree (prop_string);
|
||||
}
|
||||
|
|
@ -410,13 +413,16 @@ gst_mpdparser_get_xml_prop_unsigned_integer_64 (xmlNode * a_node,
|
|||
prop_string = xmlGetProp (a_node, (const xmlChar *) property_name);
|
||||
if (prop_string) {
|
||||
if (sscanf ((gchar *) prop_string, "%" G_GUINT64_FORMAT,
|
||||
property_value) == 1) {
|
||||
property_value) == 1 &&
|
||||
strstr ((gchar *) prop_string, "-") == NULL) {
|
||||
exists = TRUE;
|
||||
GST_LOG (" - %s: %" G_GUINT64_FORMAT, property_name, *property_value);
|
||||
} else {
|
||||
GST_WARNING
|
||||
("failed to parse unsigned integer property %s from xml string %s",
|
||||
property_name, prop_string);
|
||||
/* sscanf might have written to *property_value. Restore to default */
|
||||
*property_value = default_val;
|
||||
}
|
||||
xmlFree (prop_string);
|
||||
}
|
||||
|
|
@ -443,12 +449,21 @@ gst_mpdparser_get_xml_prop_uint_vector_type (xmlNode * a_node,
|
|||
exists = TRUE;
|
||||
GST_LOG (" - %s:", property_name);
|
||||
for (i = 0; i < *value_size; i++) {
|
||||
if (sscanf ((gchar *) str_vector[i], "%u", &prop_uint_vector[i]) == 1) {
|
||||
if (sscanf ((gchar *) str_vector[i], "%u", &prop_uint_vector[i]) == 1
|
||||
&& strstr (str_vector[i], "-") == NULL) {
|
||||
GST_LOG (" %u", prop_uint_vector[i]);
|
||||
} else {
|
||||
GST_WARNING
|
||||
("failed to parse uint vector type property %s from xml string %s",
|
||||
property_name, str_vector[i]);
|
||||
/* there is no special value to put in prop_uint_vector[i] to
|
||||
* signal it is invalid, so we just clean everything and return
|
||||
* FALSE
|
||||
*/
|
||||
g_free (prop_uint_vector);
|
||||
prop_uint_vector = NULL;
|
||||
exists = FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
*property_value = prop_uint_vector;
|
||||
|
|
@ -596,13 +611,25 @@ gst_mpdparser_get_xml_prop_range (xmlNode * a_node, const gchar * property_name,
|
|||
}
|
||||
/* read first_byte_pos */
|
||||
if (pos != 0) {
|
||||
if (sscanf (str, "%" G_GUINT64_FORMAT, &first_byte_pos) != 1) {
|
||||
/* replace str[pos] with '\0' to allow sscanf to not be confused by
|
||||
* the minus sign (eg " -1" (observe the space before -) would otherwise
|
||||
* be interpreted as range -1 to 1)
|
||||
*/
|
||||
str[pos] = 0;
|
||||
if (sscanf (str, "%" G_GUINT64_FORMAT, &first_byte_pos) != 1 ||
|
||||
strstr (str, "-") != NULL) {
|
||||
/* sscanf failed or it found a negative number */
|
||||
/* restore the '-' sign */
|
||||
str[pos] = '-';
|
||||
goto error;
|
||||
}
|
||||
/* restore the '-' sign */
|
||||
str[pos] = '-';
|
||||
}
|
||||
/* read last_byte_pos */
|
||||
if (pos < (len - 1)) {
|
||||
if (sscanf (str + pos + 1, "%" G_GUINT64_FORMAT, &last_byte_pos) != 1) {
|
||||
if (sscanf (str + pos + 1, "%" G_GUINT64_FORMAT, &last_byte_pos) != 1 ||
|
||||
strstr (str + pos + 1, "-") != NULL) {
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
|
@ -647,6 +674,10 @@ gst_mpdparser_get_xml_prop_ratio (xmlNode * a_node,
|
|||
GST_TRACE ("pos %d >= len %d", pos, len);
|
||||
goto error;
|
||||
}
|
||||
/* search for negative sign */
|
||||
if (strstr (str, "-") != NULL) {
|
||||
goto error;
|
||||
}
|
||||
/* read num */
|
||||
if (pos != 0) {
|
||||
if (sscanf (str, "%u", &num) != 1) {
|
||||
|
|
@ -693,6 +724,11 @@ gst_mpdparser_get_xml_prop_framerate (xmlNode * a_node,
|
|||
str = (gchar *) prop_string;
|
||||
GST_TRACE ("framerate: %s, len %d", str, len);
|
||||
|
||||
/* search for negative sign */
|
||||
if (strstr (str, "-") != NULL) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* read "/" if available */
|
||||
pos = strcspn (str, "/");
|
||||
/* read num */
|
||||
|
|
@ -751,7 +787,7 @@ gst_mpdparser_get_xml_prop_cond_uint (xmlNode * a_node,
|
|||
val = 0;
|
||||
} else {
|
||||
flag = TRUE;
|
||||
if (sscanf (str, "%u", &val) != 1)
|
||||
if (sscanf (str, "%u", &val) != 1 || strstr (str, "-") != NULL)
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
|
@ -807,42 +843,42 @@ gst_mpdparser_get_xml_prop_dateTime (xmlNode * a_node,
|
|||
GST_TRACE ("dateTime: %s, len %d", str, xmlStrlen (prop_string));
|
||||
/* parse year */
|
||||
ret = sscanf (str, "%d", &year);
|
||||
if (ret != 1)
|
||||
if (ret != 1 || year <= 0)
|
||||
goto error;
|
||||
pos = strcspn (str, "-");
|
||||
str += (pos + 1);
|
||||
GST_TRACE (" - year %d", year);
|
||||
/* parse month */
|
||||
ret = sscanf (str, "%d", &month);
|
||||
if (ret != 1)
|
||||
if (ret != 1 || month <= 0)
|
||||
goto error;
|
||||
pos = strcspn (str, "-");
|
||||
str += (pos + 1);
|
||||
GST_TRACE (" - month %d", month);
|
||||
/* parse day */
|
||||
ret = sscanf (str, "%d", &day);
|
||||
if (ret != 1)
|
||||
if (ret != 1 || day <= 0)
|
||||
goto error;
|
||||
pos = strcspn (str, "T");
|
||||
str += (pos + 1);
|
||||
GST_TRACE (" - day %d", day);
|
||||
/* parse hour */
|
||||
ret = sscanf (str, "%d", &hour);
|
||||
if (ret != 1)
|
||||
if (ret != 1 || hour < 0)
|
||||
goto error;
|
||||
pos = strcspn (str, ":");
|
||||
str += (pos + 1);
|
||||
GST_TRACE (" - hour %d", hour);
|
||||
/* parse minute */
|
||||
ret = sscanf (str, "%d", &minute);
|
||||
if (ret != 1)
|
||||
if (ret != 1 || minute < 0)
|
||||
goto error;
|
||||
pos = strcspn (str, ":");
|
||||
str += (pos + 1);
|
||||
GST_TRACE (" - minute %d", minute);
|
||||
/* parse second */
|
||||
ret = sscanf (str, "%d", &second);
|
||||
if (ret != 1)
|
||||
if (ret != 1 || second < 0)
|
||||
goto error;
|
||||
GST_TRACE (" - second %d", second);
|
||||
|
||||
|
|
@ -935,6 +971,11 @@ gst_mpdparser_get_xml_prop_duration_inner (xmlNode * a_node,
|
|||
sign = -1;
|
||||
str++;
|
||||
len--;
|
||||
/* look for another "-" sign */
|
||||
if (strcspn (str, "-") != len) {
|
||||
GST_WARNING ("found a second \"-\" sign");
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
/* read "P" for period */
|
||||
pos = strcspn (str, "P");
|
||||
|
|
|
|||
|
|
@ -4524,6 +4524,81 @@ GST_START_TEST (dash_mpdparser_negative_period_duration)
|
|||
|
||||
GST_END_TEST;
|
||||
|
||||
/*
|
||||
* Test parsing negative values from attributes that should be unsigned
|
||||
*
|
||||
*/
|
||||
GST_START_TEST (dash_mpdparser_read_unsigned_from_negative_values)
|
||||
{
|
||||
GstPeriodNode *periodNode;
|
||||
GstSegmentBaseType *segmentBase;
|
||||
GstAdaptationSetNode *adaptationSet;
|
||||
GstRepresentationNode *representation;
|
||||
GstSubRepresentationNode *subRepresentation;
|
||||
|
||||
const gchar *xml =
|
||||
"<?xml version=\"1.0\"?>"
|
||||
"<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\""
|
||||
" profiles=\"urn:mpeg:dash:profile:isoff-main:2011\""
|
||||
" availabilityStartTime=\"2015--1-13T12:25:37\">"
|
||||
" <Period start=\"-P-2015Y\" duration=\"-P-5M\">"
|
||||
" <SegmentBase presentationTimeOffset=\"-10\""
|
||||
" timescale=\"-5\""
|
||||
" indexRange=\"1--10\">"
|
||||
" </SegmentBase>"
|
||||
" <AdaptationSet par=\"-1:7\""
|
||||
" minFrameRate=\" -1\""
|
||||
" segmentAlignment=\"-4\">"
|
||||
" <Representation>"
|
||||
" <SubRepresentation dependencyLevel=\"1 -2 3\">"
|
||||
" </SubRepresentation>"
|
||||
" </Representation></AdaptationSet></Period></MPD>";
|
||||
|
||||
gboolean ret;
|
||||
GstMpdClient *mpdclient = gst_mpd_client_new ();
|
||||
|
||||
ret = gst_mpd_parse (mpdclient, xml, (gint) strlen (xml));
|
||||
assert_equals_int (ret, TRUE);
|
||||
|
||||
periodNode = (GstPeriodNode *) mpdclient->mpd_node->Periods->data;
|
||||
segmentBase = periodNode->SegmentBase;
|
||||
adaptationSet = (GstAdaptationSetNode *) periodNode->AdaptationSets->data;
|
||||
representation = (GstRepresentationNode *)
|
||||
adaptationSet->Representations->data;
|
||||
subRepresentation = (GstSubRepresentationNode *)
|
||||
representation->SubRepresentations->data;
|
||||
|
||||
/* availabilityStartTime parsing should fail */
|
||||
fail_if (mpdclient->mpd_node->availabilityStartTime != NULL);
|
||||
|
||||
/* Period start parsing should fail */
|
||||
assert_equals_int64 (periodNode->start, -1);
|
||||
|
||||
/* Period duration parsing should fail */
|
||||
assert_equals_int64 (periodNode->duration, -1);
|
||||
|
||||
/* expect negative value to be rejected and presentationTimeOffset to be 0 */
|
||||
assert_equals_uint64 (segmentBase->presentationTimeOffset, 0);
|
||||
assert_equals_uint64 (segmentBase->timescale, 1);
|
||||
fail_if (segmentBase->indexRange != NULL);
|
||||
|
||||
/* par ratio parsing should fail */
|
||||
fail_if (adaptationSet->par != NULL);
|
||||
|
||||
/* minFrameRate parsing should fail */
|
||||
fail_if (adaptationSet->minFrameRate != NULL);
|
||||
|
||||
/* segmentAlignment parsing should fail */
|
||||
fail_if (adaptationSet->segmentAlignment != NULL);
|
||||
|
||||
/* dependency level parsing should fail */
|
||||
fail_if (subRepresentation->dependencyLevel != NULL);
|
||||
|
||||
gst_mpd_client_free (mpdclient);
|
||||
}
|
||||
|
||||
GST_END_TEST;
|
||||
|
||||
/*
|
||||
* create a test suite containing all dash testcases
|
||||
*/
|
||||
|
|
@ -4683,6 +4758,8 @@ dash_suite (void)
|
|||
tcase_add_test (tc_negativeTests,
|
||||
dash_mpdparser_wrong_period_duration_inferred_from_next_mediaPresentationDuration);
|
||||
tcase_add_test (tc_negativeTests, dash_mpdparser_negative_period_duration);
|
||||
tcase_add_test (tc_negativeTests,
|
||||
dash_mpdparser_read_unsigned_from_negative_values);
|
||||
|
||||
tcase_add_test (tc_stringTests, dash_mpdparser_whitespace_strings);
|
||||
tcase_add_test (tc_stringTests, dash_mpdparser_rfc1738_strings);
|
||||
|
|
|
|||
Loading…
Reference in a new issue