From 1ce98c97cfd48444b46c2fc1801fbec4808b20f2 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 21 Nov 2008 12:01:41 +0000 Subject: [PATCH] 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. --- ChangeLog | 12 ++++++++++++ clutter/clutter-score.c | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dea1cd2be..2f6de8a1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-11-21 Neil Roberts + + 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 * clutter/clutter-actor.c: diff --git a/clutter/clutter-score.c b/clutter/clutter-score.c index c99255a9e..cb65b8bd5 100644 --- a/clutter/clutter-score.c +++ b/clutter/clutter-score.c @@ -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); }