pidgin: 2d5d7c3f: Avoid crashing on some more atoi calls a...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2d5d7c3fe05abab533f27bcda6528dc363291dac
Ancestor: 1783b284531897124661a5b21d4ae0e9b021101c
Author: darkrain42 at pidgin.im
Date: 2009-04-30T04:01:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2d5d7c3fe05abab533f27bcda6528dc363291dac

Modified files:
        libpurple/protocols/jabber/google.c

ChangeLog: 

Avoid crashing on some more atoi calls and ensure required parameters are !NULL

The rewrite in google_session_handle_candidates is for readability

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	d9c6c60bc06f5688aaf1b396d8b2ec7497f44ab3
+++ libpurple/protocols/jabber/google.c	9f9765cbf7a4088168fe37f3e1938ac814ca6059
@@ -421,9 +421,11 @@ google_session_handle_initiate(JabberStr
 		id = xmlnode_get_attrib(codec_element, "id");
 		clock_rate = xmlnode_get_attrib(codec_element, "clockrate");
 
-		codec = purple_media_codec_new(atoi(id), encoding_name, PURPLE_MEDIA_AUDIO,
-				     clock_rate ? atoi(clock_rate) : 0);
-		codecs = g_list_append(codecs, codec);
+		if (id) {
+			codec = purple_media_codec_new(atoi(id), encoding_name, PURPLE_MEDIA_AUDIO,
+					     clock_rate ? atoi(clock_rate) : 0);
+			codecs = g_list_append(codecs, codec);
+		}
 	}
 
 	purple_media_set_remote_codecs(session->media, "google-voice", session->remote_jid, codecs);
@@ -459,24 +461,36 @@ google_session_handle_candidates(JabberS
 		
 	for (cand = xmlnode_get_child(sess, "candidate"); cand; cand = xmlnode_get_next_twin(cand)) {
 		PurpleMediaCandidate *info;
-		g_snprintf(n, sizeof(n), "S%d", name++);
-		info = purple_media_candidate_new(n, PURPLE_MEDIA_COMPONENT_RTP,
-				!strcmp(xmlnode_get_attrib(cand, "type"), "local") ?
-					PURPLE_MEDIA_CANDIDATE_TYPE_HOST :
-			     		!strcmp(xmlnode_get_attrib(cand, "type"), "stun") ?
-						PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX :
-			     			!strcmp(xmlnode_get_attrib(cand, "type"), "relay") ?
-							PURPLE_MEDIA_CANDIDATE_TYPE_RELAY :
-							PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
-						!strcmp(xmlnode_get_attrib(cand, "protocol"),"udp") ?
+		const gchar *type = xmlnode_get_attrib(cand, "type");
+		const gchar *protocol = xmlnode_get_attrib(cand, "protocol");
+		const gchar *address = xmlnode_get_attrib(cand, "address");
+		const gchar *port = xmlnode_get_attrib(cand, "port");
+
+		if (type && address && port) {
+			PurpleMediaCandidateType candidate_type;
+
+			g_snprintf(n, sizeof(n), "S%d", name++);
+
+			if (g_str_equal(type, "local"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
+			else if (g_str_equal(type, "stun"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX;
+			else if (g_str_equal(type, "relay"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_RELAY;
+			else
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
+
+			info = purple_media_candidate_new(n, PURPLE_MEDIA_COMPONENT_RTP,
+					candidate_type,
+					purple_strequal(protocol, "udp") ?
 							PURPLE_MEDIA_NETWORK_PROTOCOL_UDP :
 							PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
-					xmlnode_get_attrib(cand, "address"),
-					atoi(xmlnode_get_attrib(cand, "port")));
-		g_object_set(info, "username", xmlnode_get_attrib(cand, "username"),
-				"password", xmlnode_get_attrib(cand, "password"), NULL);
-
-		list = g_list_append(list, info);
+					address,
+					atoi(port));
+			g_object_set(info, "username", xmlnode_get_attrib(cand, "username"),
+					"password", xmlnode_get_attrib(cand, "password"), NULL);
+			list = g_list_append(list, info);
+		}
 	}
 
 	purple_media_add_remote_candidates(session->media, "google-voice", session->remote_jid, list);
@@ -504,10 +518,12 @@ google_session_handle_accept(JabberStrea
 		const gchar *clock_rate =
 				xmlnode_get_attrib(codec_element, "clockrate");
 
-		PurpleMediaCodec *codec = purple_media_codec_new(atoi(id),
-				encoding_name, PURPLE_MEDIA_AUDIO,
-				clock_rate ? atoi(clock_rate) : 0);
-		codecs = g_list_append(codecs, codec);
+		if (id && encoding_name) {
+			PurpleMediaCodec *codec = purple_media_codec_new(atoi(id),
+					encoding_name, PURPLE_MEDIA_AUDIO,
+					clock_rate ? atoi(clock_rate) : 0);
+			codecs = g_list_append(codecs, codec);
+		}
 	}
 
 	purple_media_set_remote_codecs(session->media, "google-voice",