From 915be2e2c78058729221d3dff2a77f83567b0880 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 6 Jul 2004 11:44:26 +0000 Subject: [PATCH] fix SIGBUS on opt, #145338 Original commit message from CVS: fix SIGBUS on opt, #145338 --- ChangeLog | 12 ++++++++++-- gst/schedulers/gstoptimalscheduler.c | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62217400fb..477f843acc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,17 @@ +2004-07-06 Thomas Vander Stichele + + patch by: Joe Marcus Clarke + + * gst/schedulers/gstoptimalscheduler.c: + (gst_opt_scheduler_pad_unlink): + fix SIGBUS error, fixes #145338 + 2004-07-06 Thomas Vander Stichele * gst/gstobject.c: (gst_object_replace): * gst/gstscheduler.c: (gst_scheduler_get_clock): * gst/gstsystemclock.c: (gst_system_clock_obtain): - clean up clock lifecycle. Fixes #109831 + clean up clock lifecycle. Fixes #109831 2004-07-06 Thomas Vander Stichele @@ -372,7 +380,7 @@ 2004-06-10 Johan Dahlin * gst/gst.c (gst_init_check_with_popt_table): Do not fail on - errors, like gtk. It makes it more useful in bindings. + errors, like gtk. It makes it more useful in bindings. Fixes #141692. 2004-06-09 Thomas Vander Stichele diff --git a/gst/schedulers/gstoptimalscheduler.c b/gst/schedulers/gstoptimalscheduler.c index 641d234177..caeb88a8bb 100644 --- a/gst/schedulers/gstoptimalscheduler.c +++ b/gst/schedulers/gstoptimalscheduler.c @@ -2276,7 +2276,7 @@ gst_opt_scheduler_pad_unlink (GstScheduler * sched, GST_LOG ("elements still have links with other elements in the group"); - while (group->elements) + while (group && group->elements) for (l = group->elements; l && l->data; l = l->next) { GstElement *element = (GstElement *) l->data; @@ -2309,7 +2309,7 @@ gst_opt_scheduler_pad_unlink (GstScheduler * sched, } if (linkcount < 2) { - remove_from_group (group, element); + group = remove_from_group (group, element); } /* if linkcount == 2, it will be unlinked later on */ else if (linkcount > 2) { -- 2.34.1