Mercurial > pidgin
changeset 31619:3e53f6871805
merge of 'b8354dfc19eecdfd2aecfdb2685fbd78b9010587'
and 'e406ff22b49f15b4ba4888f05f0e019b38575ea2'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 24 May 2011 01:48:26 +0000 |
| parents | 504a65e03514 (current diff) 4ad7ff6bdc4e (diff) |
| children | 3a90a59ddea2 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/media/backend-fs2.c Fri May 20 22:29:29 2011 +0000 +++ b/libpurple/media/backend-fs2.c Tue May 24 01:48:26 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);