mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-04 15:19:57 +00:00
Code Issues 1 Projects Releases Wiki Activity

Check for NULL before _reffing the bus. Fixes #353122.

Browse source 
Original commit message from CVS:
Patch by: Torsten Schoenfeld <kaffeetisch at gmx dot de>
* gst/gstelement.c: (gst_element_get_bus):
* tests/check/gst/gstelement.c: (GST_START_TEST):
Check for NULL before _reffing the bus. Fixes #353122.
This commit is contained in:
Torsten Schoenfeld 2006-08-28 08:35:31 +00:00 committed by Wim Taymans
parent 4ff1d20852
commit 7fc02489e3
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-08-28 Wim Taymans <wim@fluendo.com>
Patch by: Torsten Schoenfeld <kaffeetisch at gmx dot de>
* gst/gstelement.c: (gst_element_get_bus):
* tests/check/gst/gstelement.c: (GST_START_TEST):
Check for NULL before _reffing the bus. Fixes #353122.
2006-08-25 Tim-Philipp Müller <tim at centricular dot net>
* docs/manual/basics-bus.xml:

4
gst/gstelement.c
View file

@ -2695,8 +2695,8 @@ gst_element_get_bus (GstElement * element)
g_return_val_if_fail (GST_IS_ELEMENT (element), result);
GST_OBJECT_LOCK (element);
result = GST_ELEMENT_BUS (element);
gst_object_ref (result);
if ((result = GST_ELEMENT_BUS (element)))
gst_object_ref (result);
GST_OBJECT_UNLOCK (element);
GST_DEBUG_OBJECT (element, "got bus %" GST_PTR_FORMAT, result);

5
tests/check/gst/gstelement.c
View file

@ -82,9 +82,14 @@ GST_END_TEST;
GST_START_TEST (test_error_no_bus)
{
GstElement *e;
GstBus *bus;
e = gst_element_factory_make ("fakesrc", "source");
/* get the bus, should be NULL */
bus = gst_element_get_bus (e);
fail_if (bus != NULL);
/* I don't want errors shown */
gst_debug_set_default_threshold (GST_LEVEL_NONE);