diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-29 22:03:39 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-29 22:03:39 +0000 |
| commit | 6b325192ae0a7764c231f1c5b7a4cee3f240f0a7 (patch) | |
| tree | 8e5decc455a85b06183c7626113a162213c5a8e7 /protocols/Gadu-Gadu | |
| parent | 58570408586d7cfd0648135ac89d606b908460f3 (diff) | |
even less mir_strncat()
git-svn-id: http://svn.miranda-ng.org/main/trunk@13903 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Gadu-Gadu')
| -rw-r--r-- | protocols/Gadu-Gadu/src/filetransfer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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)
|