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 --- src/core/stdfile/src/file.cpp | 4 ++-- src/core/stdmsg/src/msglog.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core') diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp index fbe092784a..af5483841d 100644 --- a/src/core/stdfile/src/file.cpp +++ b/src/core/stdfile/src/file.cpp @@ -412,13 +412,13 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam) *(DWORD*)dbei.pBlob = 0; BYTE* p = dbei.pBlob + sizeof(DWORD); for (int i = 0; i < pre->fileCount; i++) { - strcpy((char*)p, pszFiles[i]); + mir_strcpy((char*)p, pszFiles[i]); p += mir_strlen(pszFiles[i]) + 1; if (bUnicode) mir_free(pszFiles[i]); } - strcpy((char*)p, (szDescr == NULL) ? "" : szDescr); + mir_strcpy((char*)p, (szDescr == NULL) ? "" : szDescr); if (bUnicode) mir_free(szDescr); diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index f3e13ccd9d..4852cf91d1 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -85,7 +85,7 @@ static int AppendToBufferWithRTF(char *&buffer, size_t &cbBufferEnd, size_t &cbB } d = buffer + cbBufferEnd; - strcpy(d, "{\\uc1 "); + mir_strcpy(d, "{\\uc1 "); d += 6; for (; *line; line++, textCharsCount++) { @@ -482,8 +482,8 @@ void StreamInEvents(HWND hwndDlg, MEVENT hDbEventFirst, int count, int fAppend) SendMessage(hwndLog, EM_EXSETSEL, 0, (LPARAM)& sel); } - strcpy(szSep2, fAppend ? "\\par\\sl0" : "\\sl1000"); - strcpy(szSep2_RTL, fAppend ? "\\rtlpar\\rtlmark\\par\\sl1000" : "\\sl1000"); + mir_strcpy(szSep2, fAppend ? "\\par\\sl0" : "\\sl1000"); + mir_strcpy(szSep2_RTL, fAppend ? "\\rtlpar\\rtlmark\\par\\sl1000" : "\\sl1000"); SendMessage(hwndLog, EM_STREAMIN, fAppend ? SFF_SELECTION | SF_RTF : SF_RTF, (LPARAM)& stream); if (bottomScroll) { @@ -545,7 +545,7 @@ void LoadMsgLogIcons(void) char *szDest = pLogIconBmpBits[i] + rtfHeaderSize; bin2hex(&bih, sizeof(bih), szDest); szDest += sizeof(bih) * 2; bin2hex(pBmpBits, widthBytes * bih.biHeight, szDest); szDest += widthBytes * bih.biHeight * 2; - strcpy(szDest, "}"); + mir_strcpy(szDest, "}"); logIconBmpSize[i] = size_t(szDest - pLogIconBmpBits[i]) + 1; } -- cgit v1.2.3