From 95ef2908cb4e6a6f545a49ed300dc2d2a4f0d984 Mon Sep 17 00:00:00 2001
From: Stefan Becker <chemobejk@gmail.com>
Date: Sat, 11 Jun 2011 22:00:43 +0300
Subject: [PATCH] media: Fix uninitialized variable compilation errors

After latest configure.ac update media got enabled on Fedora 15 (that's another
bug) and revealed some compilation errors.
---
 src/core/sdpmsg.c     |  7 ++++++-
 src/core/sipe-media.c | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/core/sdpmsg.c b/src/core/sdpmsg.c
index 67f8680f..1812c52b 100644
--- a/src/core/sdpmsg.c
+++ b/src/core/sdpmsg.c
@@ -441,6 +441,10 @@ candidates_to_string(GSList *candidates, SipeIceVersion ice_version)
 			case SIPE_NETWORK_PROTOCOL_UDP:
 				protocol = "UDP";
 				break;
+			default:
+				/* error unknown/unsupported type */
+				protocol = "UNKOWN";
+				break;
 		}
 
 		if (ice_version == SIPE_ICE_RFC_5245) {
@@ -465,7 +469,8 @@ candidates_to_string(GSList *candidates, SipeIceVersion ice_version)
 					type = "prflx";
 					break;
 				default:
-					// TODO: error unknown/unsupported type
+					/* error unknown/unsupported type */
+					type = "unknown";
 					break;
 			}
 
diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c
index 6594f309..d08e00fd 100644
--- a/src/core/sipe-media.c
+++ b/src/core/sipe-media.c
@@ -170,6 +170,10 @@ backend_stream_to_sdpmedia(struct sipe_backend_media *backend_media,
 		type = SIPE_MEDIA_VIDEO;
 	else {
 		// TODO: incompatible media, should not happen here
+		g_free(media->name);
+		g_free(media);
+		sipe_media_codec_list_free(codecs);
+		return(NULL);
 	}
 
 	// Process codecs
@@ -250,12 +254,13 @@ sipe_media_to_sdpmsg(struct sipe_media_call_private *call_private)
 	GSList *streams = sipe_backend_media_get_streams(backend_media);
 
 	for (; streams; streams = streams->next) {
-		struct sdpmedia *media;
-		media = backend_stream_to_sdpmedia(backend_media, streams->data);
-		msg->media = g_slist_append(msg->media, media);
+		struct sdpmedia *media = backend_stream_to_sdpmedia(backend_media, streams->data);
+		if (media) {
+			msg->media = g_slist_append(msg->media, media);
 
-		if (msg->ip == NULL)
-			msg->ip = g_strdup(media->ip);
+			if (msg->ip == NULL)
+				msg->ip = g_strdup(media->ip);
+		}
 	}
 
 	msg->media = g_slist_concat(msg->media, call_private->failed_media);
-- 
2.11.4.GIT