From 03db06c52cad84ecb2bf0b3fff8a518ff895dc19 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 15 May 2015 13:31:23 +0000 Subject: - crash fix in chats; - static buffer returned, now with buffer overrun control; - warnings fixed git-svn-id: http://svn.miranda-ng.org/main/trunk@13604 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_soapab.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'protocols/MSN/src/msn_soapab.cpp') diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp index d32301b291..8c79783a06 100644 --- a/protocols/MSN/src/msn_soapab.cpp +++ b/protocols/MSN/src/msn_soapab.cpp @@ -909,19 +909,21 @@ bool CMsnProto::MSN_ABRefreshClist(void) if (mycid && !strcmp(cid, mycid)) continue; for (ezxml_t cont = ezxml_get(pers, "contacts", 0, "Contact", -1); cont != NULL; cont = ezxml_next(cont)) { - int netId = NETID_UNKNOWN; + int netId; const char* szEmail; const char *src = ezxml_txt(ezxml_child(cont, "sourceId")); if (!strcmp(src, "WL")) { netId = NETID_MSN; szEmail = ezxml_txt(ezxml_child(cont, "domainTag")); - } else if (!strcmp(src, "SKYPE")) { + } + else if (!strcmp(src, "SKYPE")) { netId = NETID_SKYPE; szEmail = ezxml_txt(ezxml_child(cont, "objectId")); } + else continue; - if (netId == NETID_UNKNOWN || szEmail[0] == 0) + if (mir_strlen(szEmail) == 0) continue; ezxml_t xmlnick = ezxml_child(pers, "nickname"); -- cgit v1.2.3