changeset 25287:b333ebd093df

merge of '5f8528ffc18355719bd406e1c579e0e369fb2585' and '7811d6e917a33b224cad7842445e932470fcc55e'
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 08 Jan 2009 14:16:42 +0000
parents 2aa4b88bdcf8 (diff) ca4ccf646993 (current diff)
children 8a930bc2734d
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/oim.c	Thu Jan 08 05:24:10 2009 +0000
+++ b/libpurple/protocols/msn/oim.c	Thu Jan 08 14:16:42 2009 +0000
@@ -651,7 +651,7 @@
 
 	/* Match number to user's mobile number, FROM is a phone number
 	   if the other side pages you using your phone number */
-	if (!strncmp(from, "tel:+", 5)) {
+	if (from && !strncmp(from, "tel:+", 5)) {
 		MsnUser *user =	msn_userlist_find_user_with_mobile_phone(
 				rdata->oim->session->userlist, from + 4);