# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1306201585 0
# Node ID 4ad7ff6bdc4e28020b7fabd2e6fbd53a2721d0d2
# Parent  3268f7da72c63893412720d93c93da8c9da6e57c
media/backend-fs2: Better fix for the NULL deref crash here.

Based on the latest test, GST_ELEMENT_PARENT() is returning NULL at
some point.  Closes #14033

diff -r 3268f7da72c6 -r 4ad7ff6bdc4e libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c	Fri May 20 04:19:13 2011 +0000
+++ b/libpurple/media/backend-fs2.c	Tue May 24 01:46:25 2011 +0000
@@ -1091,13 +1091,7 @@
 	g_error_free(error);
 	g_free(debug_msg);
 
-	/* Not entirely sure this is correct, but prevents a
-	 * NULL deref crash.
-	 */
-	if (!element)
-		return;
-
-	while (!GST_IS_PIPELINE(element)) {
+	while (element && !GST_IS_PIPELINE(element)) {
 		if (element == priv->confbin)
 			break;
 
@@ -1105,7 +1099,7 @@
 		element = GST_ELEMENT_PARENT(element);
 	}
 
-	if (!GST_IS_PIPELINE(element))
+	if (!element || !GST_IS_PIPELINE(element))
 		return;
 
 	sessions = purple_media_get_session_ids(priv->media);