From 3a4e64f3b6109ceac961dc8d2c6aa93f18f87514 Mon Sep 17 00:00:00 2001 From: Piotr Piastucki Date: Fri, 15 May 2015 14:09:33 +0000 Subject: Fixed bug on static buffer copy introduced in 13604 Removed unnecessary use of strlen git-svn-id: http://svn.miranda-ng.org/main/trunk@13606 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_soapab.cpp | 3 +-- protocols/MSN/src/msn_threads.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp index 8c79783a06..27ba917d24 100644 --- a/protocols/MSN/src/msn_soapab.cpp +++ b/protocols/MSN/src/msn_soapab.cpp @@ -923,8 +923,7 @@ bool CMsnProto::MSN_ABRefreshClist(void) } else continue; - if (mir_strlen(szEmail) == 0) - continue; + if (!*szEmail) continue; ezxml_t xmlnick = ezxml_child(pers, "nickname"); const char *pszNickname = xmlnick?xmlnick->txt:NULL; diff --git a/protocols/MSN/src/msn_threads.cpp b/protocols/MSN/src/msn_threads.cpp index 6a531525a1..382c113891 100644 --- a/protocols/MSN/src/msn_threads.cpp +++ b/protocols/MSN/src/msn_threads.cpp @@ -207,7 +207,7 @@ void __cdecl CMsnProto::MSNServerThread(void* arg) break; //wait for full line end char msg[1024]; - strncpy_s(msg, info->mData, _TRUNCATE); + strncpy_s(msg, info->mData, msgLen); if (*++peol != '\n') debugLogA("Dodgy line ending to command: ignoring"); -- cgit v1.2.3