diff options
| author | Piotr Piastucki <leech.miranda@gmail.com> | 2015-05-14 18:33:16 +0000 |
|---|---|---|
| committer | Piotr Piastucki <leech.miranda@gmail.com> | 2015-05-14 18:33:16 +0000 |
| commit | f4048a55be034634434050cfa7748aa9f5d18126 (patch) | |
| tree | e8287cc0205e4e8083053abc6f4a737611a8b8a4 | |
| parent | f9475db573dcf34f9b8ea8180b69c834978f6ac9 (diff) | |
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
| -rw-r--r-- | protocols/MSN/src/msn_contact.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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);
|