brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 1280 - clutter_score_append_at_marker lead to segmentation

Browse Source 
fault in trunk and incorrect appearance in clutter-0.8

	* clutter/clutter-score.c (start_children_entries): Check whether
	the child timeline is actually attached at a marker before
	comparing whether the marker's name matches the marker
	reached. This fixes a crash that happens when a marker is reached
	on a timeline that also has child timelines attached at the
	end. Thanks to zhangwei for spotting.
This commit is contained in:
Neil Roberts 2008-11-21 12:01:41 +00:00
parent 47150304cd
commit 1ce98c97cf
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-11-21 Neil Roberts <neil@linux.intel.com>
Bug 1280 - clutter_score_append_at_marker lead to segmentation
fault in trunk and incorrect appearance in clutter-0.8
* clutter/clutter-score.c (start_children_entries): Check whether
the child timeline is actually attached at a marker before
comparing whether the marker's name matches the marker
reached. This fixes a crash that happens when a marker is reached
on a timeline that also has child timelines attached at the
end. Thanks to zhangwei for spotting.
2008-11-20 Emmanuele Bassi <ebassi@linux.intel.com>
* clutter/clutter-actor.c:

4
clutter/clutter-score.c
View File

@ -601,7 +601,9 @@ start_children_entries (GNode *node,
/* If data is NULL, start all entries that have no marker, otherwise
only start entries that have the same marker */
if (data == NULL ? entry->marker == NULL : !strcmp (data, entry->marker))
if (data == NULL
? entry->marker == NULL
: (entry->marker && !strcmp (data, entry->marker)))
start_entry (entry);
}