From babf7873a3fe373d60ef22b1b671d98e014d8819 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 19:52:29 +0000 Subject: replace strcpy to mir_strcpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13763 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/crypt_lists.cpp | 4 ++-- plugins/SecureIM/src/mmi.cpp | 6 +++--- plugins/SecureIM/src/options.cpp | 2 +- plugins/SecureIM/src/splitmsg.cpp | 2 +- plugins/SecureIM/src/svcs_proto.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/SecureIM') diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp index 9137f9b592..40204b4789 100644 --- a/plugins/SecureIM/src/crypt_lists.cpp +++ b/plugins/SecureIM/src/crypt_lists.cpp @@ -191,7 +191,7 @@ void addMsg2Queue(pUinKey ptr, WPARAM wParam, LPSTR szMsg) void getContactNameA(MCONTACT hContact, LPSTR szName) { - strcpy(szName, (LPCSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0)); + mir_strcpy(szName, (LPCSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0)); } void getContactName(MCONTACT hContact, LPSTR szName) @@ -220,7 +220,7 @@ void getContactUinA(MCONTACT hContact, LPSTR szUIN) else sprintf(szUIN, "%s [%s]", dbv_uniqueid.pszVal, ptr->name); //!!!!!!!!!!! } - else strcpy(szUIN, " == = unknown == ="); + else mir_strcpy(szUIN, " == = unknown == ="); db_free(&dbv_uniqueid); } diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp index 90b44148ed..6e99874fd1 100644 --- a/plugins/SecureIM/src/mmi.cpp +++ b/plugins/SecureIM/src/mmi.cpp @@ -38,7 +38,7 @@ char* m_awstrcat(LPCSTR strA, LPCSTR strB) { int lenA = (int)mir_strlen(strA); LPSTR tmpA = (LPSTR)mir_alloc((lenA + 1)*(sizeof(WCHAR) + 1)); - strcpy(tmpA, strA); + mir_strcpy(tmpA, strA); MultiByteToWideChar(CP_ACP, 0, strA, -1, (LPWSTR)(tmpA + lenA + 1), (lenA + 1)*sizeof(WCHAR)); LPSTR str = m_wwstrcat(tmpA, strB); mir_free(tmpA); @@ -51,7 +51,7 @@ char* m_aastrcat(LPCSTR strA, LPCSTR strB) int lenA = (int)mir_strlen(strA); int lenB = (int)mir_strlen(strB); LPSTR str = (LPSTR)mir_alloc((lenA + lenB + 1)*(sizeof(WCHAR) + 1)); - strcpy(str, strA); + mir_strcpy(str, strA); strcat(str, strB); MultiByteToWideChar(CP_ACP, 0, str, -1, (LPWSTR)(str + lenA + lenB + 1), (lenA + lenB + 1)*sizeof(WCHAR)); return str; @@ -64,7 +64,7 @@ char* m_ustrcat(LPCSTR strA, LPCSTR strB) { SAFE_FREE(m_string); m_string = (LPSTR)mir_alloc(mir_strlen(strA) + mir_strlen(strB) + 1); - strcpy(m_string, strA); strcat(m_string, strB); + mir_strcpy(m_string, strA); strcat(m_string, strB); return m_string; } diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index 61e09f5ff2..3d9002b57c 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -75,7 +75,7 @@ void LV_GetItemTextA(HWND hwnd, WPARAM wparam, int iSubItem, LPSTR text, int cch lvi.pszText = text; SNDMSG(hwnd, LVM_GETITEMTEXTW, wparam, (LPARAM)&lvi); lvi.pszText = mir_u2a((LPWSTR)text); - strcpy(text, lvi.pszText); + mir_strcpy(text, lvi.pszText); mir_free(lvi.pszText); } diff --git a/plugins/SecureIM/src/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp index c58cfab9e3..4fef281087 100644 --- a/plugins/SecureIM/src/splitmsg.cpp +++ b/plugins/SecureIM/src/splitmsg.cpp @@ -59,7 +59,7 @@ LPSTR combineMessage(pUinKey ptr, LPSTR szMsg) memset(pm->message, 0, sizeof(LPSTR)*part_all); } pm->message[part_num] = new char[mir_strlen(szMsg)]; - strcpy(pm->message[part_num], szMsg + 8); + mir_strcpy(pm->message[part_num], szMsg + 8); Sent_NetLog("combine: save part: %s", pm->message[part_num]); diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index 756a2dbf0f..9b2a3cb669 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -111,7 +111,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: combine untagged splitted message"); LPSTR tmp = (LPSTR)mir_alloc(mir_strlen(ptr->msgSplitted) + mir_strlen(szEncMsg) + 1); - strcpy(tmp, ptr->msgSplitted); + mir_strcpy(tmp, ptr->msgSplitted); strcat(tmp, szEncMsg); mir_free(ptr->msgSplitted); ptr->msgSplitted = szEncMsg = ppre->szMessage = tmp; @@ -225,7 +225,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) cpp_reset_context(ptr->cntx); ptrA reSend((LPSTR)mir_alloc(mir_strlen(szEncMsg) + LEN_RSND)); - strcpy(reSend, SIG_RSND); // copy resend sig + mir_strcpy(reSend, SIG_RSND); // copy resend sig strcat(reSend, szEncMsg); // add mess pccsd->wParam |= PREF_METANODB; -- cgit v1.2.3