mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
validate-utils: Only modify structure fields that really need updates
This avoids memory corruption in users of that structure which were (rightfullly) assuming static fields (such as name) wouldn't change. Without this, they would be using strings which will have been freed in the meantime. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-devtools/-/merge_requests/252>
This commit is contained in:
parent
cdfa0778c7
commit
1e1e9f2197
1 changed files with 12 additions and 8 deletions
|
@ -1339,8 +1339,6 @@ done:
|
|||
static gboolean
|
||||
_structure_set_variables (GQuark field_id, GValue * value, ReplaceData * data)
|
||||
{
|
||||
gchar *str;
|
||||
|
||||
if (field_id == filename_quark || field_id == debug_quark
|
||||
|| field_id == debug_quark)
|
||||
return TRUE;
|
||||
|
@ -1358,13 +1356,19 @@ _structure_set_variables (GQuark field_id, GValue * value, ReplaceData * data)
|
|||
if (!G_VALUE_HOLDS_STRING (value))
|
||||
return TRUE;
|
||||
|
||||
str =
|
||||
gst_validate_replace_variables_in_string (data->source, data->local_vars,
|
||||
if (!_variables_regex)
|
||||
_variables_regex = g_regex_new ("\\$\\((\\w+)\\)", 0, 0, NULL);
|
||||
|
||||
/* Don't replace string contents unless really needed */
|
||||
if (g_regex_match (_variables_regex, g_value_get_string (value), 0, NULL)) {
|
||||
gchar *str = gst_validate_replace_variables_in_string (data->source,
|
||||
data->local_vars,
|
||||
g_value_get_string (value), data->flags);
|
||||
if (str) {
|
||||
g_value_set_string (value, str);
|
||||
g_free (str);
|
||||
}
|
||||
}
|
||||
|
||||
if (!(data->flags & GST_VALIDATE_STRUCTURE_RESOLVE_VARIABLES_NO_EXPRESSION))
|
||||
_resolve_expression (data->source, value);
|
||||
|
|
Loading…
Reference in a new issue