Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 08:03:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix bad behaviour with duplicate file names

Browse Source 
If the new path is too long for the buffer we cancel the file transfer
and return an error instead of truncating the file name and continuing.
This commit is contained in:
jfreegman 2020-11-03 13:03:47 -05:00
parent a86884c40e
commit 1a723f0e8e
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/chat.c
View File

@ -638,21 +638,23 @@ static void chat_onFileRecv(ToxWindow *self, Tox *m, uint32_t friendnum, uint32_
while ((filecheck = fopen(file_path, "r"))) { while ((filecheck = fopen(file_path, "r"))) {
fclose(filecheck); fclose(filecheck);
file_path[path_len] = '\0'; file_path[path_len] = '\0';
char d[9]; char d[5];
sprintf(d, "(%d)", count); snprintf(d, sizeof(d), "(%d)", count);
++count;
size_t d_len = strlen(d); size_t d_len = strlen(d);
if (path_len + d_len >= file_path_buf_size) { if (path_len + d_len >= file_path_buf_size) {
path_len = file_path_buf_size - d_len - 1; tox_file_control(m, friendnum, filenum, TOX_FILE_CONTROL_CANCEL, NULL);
file_path[path_len] = '\0'; line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: File path too long.");
free(file_path);
return;
} }
strcat(file_path, d); strcat(file_path, d);
file_path[path_len + d_len] = '\0'; file_path[path_len + d_len] = '\0';
if (count > 999) { if (++count > 99) { // If there are this many duplicate file names we should probably give up
tox_file_control(m, friendnum, filenum, TOX_FILE_CONTROL_CANCEL, NULL); tox_file_control(m, friendnum, filenum, TOX_FILE_CONTROL_CANCEL, NULL);
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: invalid file path."); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer failed: invalid file path.");
free(file_path); free(file_path);