mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstvalue: make new gst_value_list_merge() work properly

Browse source 
Fix freeing of partially-inited list value when both values
passed are equal and we want to return a single non-list
value as result. Fixes unit test. Also fix up docs a bit.

https://bugzilla.gnome.org/show_bug.cgi?id=637776
This commit is contained in:
Tim-Philipp Müller 2011-01-03 01:06:06 +00:00
parent 373be6f14e
commit ee5b369ffd
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/gstvalue.c
View file

@ -390,11 +390,14 @@ gst_value_list_concat (GValue * dest, const GValue * value1,
* @value1: a #GValue * @value1: a #GValue
* @value2: a #GValue * @value2: a #GValue
* *
* Merges copies of @value1 and @value2 into a list. Values that are not * Merges copies of @value1 and @value2. Values that are not
* of type #GST_TYPE_LIST are treated as if they were lists of length 1. * of type #GST_TYPE_LIST are treated as if they were lists of length 1.
* @dest will be initialized to the type #GST_TYPE_LIST.
* *
* The resulting list won't have duplicated values. * The result will be put into @dest and will either be a list that will not
* contain any duplicates, or a non-list type (if @value1 and @value2
* were equal).
*
* Since: 0.10.32
*/ */
void void
gst_value_list_merge (GValue * dest, const GValue * value1, gst_value_list_merge (GValue * dest, const GValue * value1,
@ -467,11 +470,19 @@ gst_value_list_merge (GValue * dest, const GValue * value1,
/* shrink list */ /* shrink list */
g_array_set_size (array, new_size); g_array_set_size (array, new_size);
} else { } else {
GValue *tmp = dest; GValue single_dest;
/* turn into single value */ /* size is 1, take single value in list and make it new dest */
gst_value_init_and_copy (dest, &g_array_index (array, GValue, 0)); single_dest = g_array_index (array, GValue, 0);
g_value_unset (tmp);
/* clean up old value allocations: must set array size to 0, because
* allocated values are not inited meaning g_value_unset() will not
* work on them */
g_array_set_size (array, 0);
g_value_unset (dest);
/* the single value is our new result */
*dest = single_dest;
} }
} }
} }