From 6b325192ae0a7764c231f1c5b7a4cee3f240f0a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 May 2015 22:03:39 +0000 Subject: even less mir_strncat() git-svn-id: http://svn.miranda-ng.org/main/trunk@13903 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/filetransfer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'protocols/Gadu-Gadu/src/filetransfer.cpp') diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp index 53e3668e3c..3190ac35bb 100644 --- a/protocols/Gadu-Gadu/src/filetransfer.cpp +++ b/protocols/Gadu-Gadu/src/filetransfer.cpp @@ -702,16 +702,14 @@ HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath) { struct gg_dcc7 *dcc7 = (struct gg_dcc7 *) hTransfer; char fileName[MAX_PATH], *path = mir_t2a(szPath); - int iFtRemoveRes; - strncpy(fileName, path, sizeof(fileName)); - mir_strncat(fileName, (char*)dcc7->filename, sizeof(fileName) - mir_strlen(fileName)); - dcc7->folder = _strdup((char *) path); + mir_snprintf(fileName, _countof(fileName), "%s%s", path, dcc7->filename); + dcc7->folder = _strdup((char*)path); dcc7->tick = 0; mir_free(path); // Remove transfer from waiting list gg_EnterCriticalSection(&ft_mutex, "dcc7fileallow", 40, "ft_mutex", 1); - iFtRemoveRes = list_remove(&transfers, dcc7, 0); + int iFtRemoveRes = list_remove(&transfers, dcc7, 0); gg_LeaveCriticalSection(&ft_mutex, "dcc7fileallow", 40, 1, "ft_mutex", 1); if (iFtRemoveRes == -1) -- cgit v1.2.3