From: <tp...@fr...> - 2006-01-18 18:58:55
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Wed Jan 18 2006 10:56:56 PST Log message: * gst/gstbin.c: (gst_bin_dispose): Guard gst_object_unref call against a NULL object (dispose can theoretically be called multiple times). Modified files: . : ChangeLog gst : gstbin.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2193&r2=1.2194 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.320&r2=1.321 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2193 retrieving revision 1.2194 diff -u -d -r1.2193 -r1.2194 --- ChangeLog 18 Jan 2006 18:01:54 -0000 1.2193 +++ ChangeLog 18 Jan 2006 18:56:44 -0000 1.2194 @@ -1,3 +1,9 @@ +2006-01-18 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstbin.c: (gst_bin_dispose): + Guard gst_object_unref call against a NULL object (dispose + can theoretically be called multiple times). + 2006-01-18 Wim Taymans <wi...@fl...> * gst/gstbin.c: (gst_bin_element_set_state): Index: gstbin.c RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v retrieving revision 1.320 retrieving revision 1.321 diff -u -d -r1.320 -r1.321 --- gstbin.c 18 Jan 2006 18:01:54 -0000 1.320 +++ gstbin.c 18 Jan 2006 18:56:44 -0000 1.321 @@ -381,8 +381,8 @@ GST_CAT_DEBUG_OBJECT (GST_CAT_REFCOUNTING, object, "dispose"); bin_remove_messages (bin, NULL, GST_MESSAGE_ANY); - gst_object_unref (bin->child_bus); - bin->child_bus = NULL; + gst_object_replace ((GstObject **) & bin->child_bus, NULL); gst_object_replace ((GstObject **) & bin->provided_clock, NULL); while (bin->children) { |