diff libpurple/media.c @ 28045:98d8c11e4937

Gracefully handle failures to create an FsStream. This was caused by Farsight 2's new "tos" property which isn't defaulting to 0 properly on some systems. This won't make calls on systems that are affected by this bug #10017 work, but it won't crash now. Fixes #10016
author maiku@pidgin.im
date Sat, 22 Aug 2009 02:55:18 +0000
parents f77978e6968e
children f0eaa57f58c3
line wrap: on
line diff
--- a/libpurple/media.c	Sat Aug 22 02:28:23 2009 +0000
+++ b/libpurple/media.c	Sat Aug 22 02:55:18 2009 +0000
@@ -2730,10 +2730,13 @@
 					num_params, params, &err);
 		}
 
-		if (err) {
-			purple_debug_error("media", "Error creating stream: %s\n",
-					   err->message);
-			g_error_free(err);
+		if (fsstream == NULL) {
+			purple_debug_error("media",
+					"Error creating stream: %s\n",
+					err && err->message ?
+					err->message : "NULL");
+			if (err)
+				g_error_free(err);
 			g_object_unref(participant);
 			g_hash_table_remove(media->priv->participants, who);
 			purple_media_remove_session(media, session);