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

gstvalue: preserve parse behaviour with warning

Browse source 
Preserve the previous behaviour where:
    name, val="5";
passed to gst_structure_from_string would have resulted in an int value,
rather than a string, despite the quote marks.

This will be changed to being interpreted as a string in the future, but
for the time being we will issue a warning about this to give users time
to fix their code to no longer rely on this bug.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/303>
This commit is contained in:
Henry Wilkes 2019-10-28 18:06:14 +00:00 committed by Thibault Saunier
parent 445df0c799
commit 5eba2b83b7
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/gstvalue.c
View file

@ -2803,17 +2803,43 @@ _priv_gst_value_parse_value (gchar * str,
G_TYPE_BOOLEAN, G_TYPE_STRING G_TYPE_BOOLEAN, G_TYPE_STRING
}; };
int i; int i;
int value_size;
gboolean check_wrapped_non_string;
if (G_UNLIKELY (!_priv_gst_value_parse_string (s, &value_end, &s, FALSE))) if (G_UNLIKELY (!_priv_gst_value_parse_string (s, &value_end, &s, FALSE)))
return FALSE; return FALSE;
/* Set NULL terminator for deserialization */ /* Set NULL terminator for deserialization */
value_size = value_end - value_s;
value_s = g_strndup (value_s, value_end - value_s); value_s = g_strndup (value_s, value_end - value_s);
/* Keep old broken behavior where "2" could be interpretted as an int */
check_wrapped_non_string = value_s[0] == '"' &&
strlen (value_s) >= 2 && value_end[-1] == '"';
for (i = 0; i < G_N_ELEMENTS (try_types); i++) { for (i = 0; i < G_N_ELEMENTS (try_types); i++) {
g_value_init (value, try_types[i]); g_value_init (value, try_types[i]);
ret = gst_value_deserialize (value, value_s); if (try_types[i] != G_TYPE_STRING && check_wrapped_non_string) {
if (ret) value_s[value_size - 1] = '\0';
break; ret = gst_value_deserialize (value, value_s + 1);
value_s[value_size - 1] = '"';
if (ret) {
const gchar *type_name = g_type_name (try_types[i]);
g_warning ("Received a structure string that contains "
"'=%s'. Reading as a %s value, rather than a string "
"value. This is undesired behaviour, and with GStreamer 1.22 "
" onward, this will be interpreted as a string value instead "
"because it is wrapped in '\"' quotes. If you want to "
"guarantee this value is read as a string, before this "
"change, use '=(string)%s' instead. If you want to read "
"in a %s value, leave its value unquoted.",
value_s, type_name, value_s, type_name);
break;
}
} else {
ret = gst_value_deserialize (value, value_s);
if (ret)
break;
}
g_value_unset (value); g_value_unset (value);
} }
} else { } else {