From f4048a55be034634434050cfa7748aa9f5d18126 Mon Sep 17 00:00:00 2001 From: Piotr Piastucki Date: Thu, 14 May 2015 18:33:16 +0000 Subject: Fixed possible NULL-pointer dereference in MSN_HContactFromEmail discovered by watcher. git-svn-id: http://svn.miranda-ng.org/main/trunk@13593 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_contact.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'protocols/MSN') diff --git a/protocols/MSN/src/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp index fab76bd362..e2ce150fca 100644 --- a/protocols/MSN/src/msn_contact.cpp +++ b/protocols/MSN/src/msn_contact.cpp @@ -35,7 +35,7 @@ MCONTACT CMsnProto::MSN_HContactFromEmail(const char* wlid, const char* msnNick, hContact = msc->hContact; if (hContact == NULL && addIfNeeded) { - int netId = msc->netId?msc->netId:(szNet?atoi(szNet):NETID_MSN); + int netId = (msc && msc->netId)?msc->netId:(szNet?atoi(szNet):NETID_MSN); hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName); if (netId != NETID_SKYPE) setString(hContact, "e-mail", szEmail); -- cgit v1.2.3