# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1231424202 0
# Node ID b333ebd093dff3f96608ec5fc583ed12aaea6311
# Parent  2aa4b88bdcf8236f54a0bdaaec8994a1d94a6c70# Parent  ca4ccf6469936125335d71c22ef869e9887065ec
merge of '5f8528ffc18355719bd406e1c579e0e369fb2585'
     and '7811d6e917a33b224cad7842445e932470fcc55e'

diff -r ca4ccf646993 -r b333ebd093df libpurple/protocols/msn/oim.c
--- 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);