summaryrefslogtreecommitdiff
path: root/protocols/MRA/src/Mra_functions.cpp
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2016-03-29 18:34:54 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2016-03-29 18:34:54 +0000
commit7460f623d00f6119979688e5c4d788a8cdc0a478 (patch)
tree695d83cacb417d2e2675632c4ace252e1d21c9cd /protocols/MRA/src/Mra_functions.cpp
parent91fa723b31fd3cd885d7f3dec8bc9d7e01d3bd41 (diff)
MRA: - minor fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@16562 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/Mra_functions.cpp')
-rw-r--r--protocols/MRA/src/Mra_functions.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 26b6ddd8ae..06e1890847 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -115,7 +115,8 @@ DWORD MraAddrListGetFromBuff(const CMStringA &szAddresses, MRA_ADDR_LIST *pmalAd
while (TRUE) {
LPSTR lpszEndItem = strchr(lpszCurrentItem, ';');
- if (lpszEndItem == NULL) lpszEndItem = buf + szAddresses.GetLength();
+ if (lpszEndItem == NULL)
+ lpszEndItem = buf + szAddresses.GetLength();
if (!lpszEndItem)
break;
@@ -414,7 +415,8 @@ DWORD CMraProto::GetContactBasicInfoW(MCONTACT hContact, DWORD *pdwID, DWORD *pd
if (pdwContactFlag)
*pdwContactFlag = GetContactFlags(hContact);
if (szEmail)
- mraGetStringA(hContact, "e-mail", *szEmail);
+ if (!mraGetStringA(hContact, "e-mail", *szEmail))
+ return 0;
if (wszNick)
DB_GetStringW(hContact, "CList", "MyHandle", *wszNick);