Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 17:43:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix a bunch of Wformat-truncation warnings due to snprintf() misuse

Browse Source
This commit is contained in:
jfreegman 2020-10-24 14:44:41 -04:00
parent 26b5fe8f9d
commit 4c302da503
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/autocomplete.c
View File

@ -279,7 +279,7 @@ static void complete_home_dir(ToxWindow *self, char *path, int pathsize, const c
char homedir[MAX_STR_SIZE] = {0}; char homedir[MAX_STR_SIZE] = {0};
get_home_dir(homedir, sizeof(homedir)); get_home_dir(homedir, sizeof(homedir));
char newline[MAX_STR_SIZE]; char newline[MAX_STR_SIZE + 1];
snprintf(newline, sizeof(newline), "%s %s%s", cmd, homedir, path + 1); snprintf(newline, sizeof(newline), "%s %s%s", cmd, homedir, path + 1);
snprintf(path, pathsize, "%s", &newline[cmdlen - 1]); snprintf(path, pathsize, "%s", &newline[cmdlen - 1]);
@ -309,12 +309,12 @@ static void complete_home_dir(ToxWindow *self, char *path, int pathsize, const c
#define MAX_DIRS 512 #define MAX_DIRS 512
int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd) int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
{ {
char b_path[MAX_STR_SIZE]; char b_path[MAX_STR_SIZE + 1];
char b_name[MAX_STR_SIZE]; char b_name[MAX_STR_SIZE + 1];
char b_cmd[MAX_STR_SIZE]; char b_cmd[MAX_STR_SIZE];
const wchar_t *tmpline = &line[wcslen(cmd) + 1]; /* start after "/command " */ const wchar_t *tmpline = &line[wcslen(cmd) + 1]; /* start after "/command " */
if (wcs_to_mbs_buf(b_path, tmpline, sizeof(b_path)) == -1) { if (wcs_to_mbs_buf(b_path, tmpline, sizeof(b_path) - 1) == -1) {
return -1; return -1;
} }
@ -323,7 +323,7 @@ int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
} }
if (b_path[0] == '~') { if (b_path[0] == '~') {
complete_home_dir(self, b_path, sizeof(b_path), b_cmd, strlen(b_cmd) + 2); complete_home_dir(self, b_path, sizeof(b_path) - 1, b_cmd, strlen(b_cmd) + 2);
} }
int si = char_rfind(b_path, '/', strlen(b_path)); int si = char_rfind(b_path, '/', strlen(b_path));
@ -332,9 +332,8 @@ int dir_match(ToxWindow *self, Tox *m, const wchar_t *line, const wchar_t *cmd)
b_path[0] = '.'; b_path[0] = '.';
b_path[1] = '\0'; b_path[1] = '\0';
} else if (!si && b_path[0] != '/') { /* look for matches in pwd */ } else if (!si && b_path[0] != '/') { /* look for matches in pwd */
char tmp[MAX_STR_SIZE]; memmove(b_path + 1, b_path, sizeof(b_path) - 1);
snprintf(tmp, sizeof(tmp), ".%s", b_path); b_path[0] = '.';
snprintf(b_path, sizeof(b_path), "%s", tmp);
} }
snprintf(b_name, sizeof(b_name), "%s", &b_path[si + 1]); snprintf(b_name, sizeof(b_name), "%s", &b_path[si + 1]);

3
src/chat.c
View File

@ -1306,7 +1306,8 @@ static void chat_onInit(ToxWindow *self, Tox *m)
char nick[TOX_MAX_NAME_LENGTH + 1]; char nick[TOX_MAX_NAME_LENGTH + 1];
size_t n_len = get_nick_truncate(m, nick, self->num); size_t n_len = get_nick_truncate(m, nick, self->num);
snprintf(statusbar->nick, sizeof(statusbar->nick), "%s", nick); memcpy(statusbar->nick, nick, n_len);
statusbar->nick[n_len] = 0;
statusbar->nick_len = n_len; statusbar->nick_len = n_len;
/* Init subwindows */ /* Init subwindows */

9
src/friendlist.c
View File

@ -491,10 +491,11 @@ void friendlist_onFriendAdded(ToxWindow *self, Tox *m, uint32_t num, bool sort)
update_friend_last_online(i, t); update_friend_last_online(i, t);
char tempname[TOX_MAX_NAME_LENGTH] = {0}; char tempname[TOX_MAX_NAME_LENGTH + 1];
get_nick_truncate(m, tempname, num); int name_len = get_nick_truncate(m, tempname, num);
snprintf(Friends.list[i].name, sizeof(Friends.list[i].name), "%s", tempname); memcpy(Friends.list[i].name, tempname, name_len);
Friends.list[i].namelength = strlen(Friends.list[i].name); Friends.list[i].name[name_len] = 0;
Friends.list[i].namelength = name_len;
if (i == Friends.max_idx) { if (i == Friends.max_idx) {
++Friends.max_idx; ++Friends.max_idx;

2
src/group_commands.c
View File

@ -75,7 +75,7 @@ void cmd_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*arg
line_info_add(self, timefrmt, selfnick, NULL, NAME_CHANGE, 0, 0, " set the group title to: %s", title); line_info_add(self, timefrmt, selfnick, NULL, NAME_CHANGE, 0, 0, " set the group title to: %s", title);
char tmp_event[MAX_STR_SIZE]; char tmp_event[MAX_STR_SIZE + 20];
snprintf(tmp_event, sizeof(tmp_event), "set title to %s", title); snprintf(tmp_event, sizeof(tmp_event), "set title to %s", title);
write_to_log(tmp_event, selfnick, self->chatwin->log, true); write_to_log(tmp_event, selfnick, self->chatwin->log, true);
} }

2
src/name_lookup.c
View File

@ -269,7 +269,7 @@ void *lookup_thread_func(void *data)
memset(&recv_data, 0, sizeof(struct Recv_Curl_Data)); memset(&recv_data, 0, sizeof(struct Recv_Curl_Data));
char post_data[MAX_STR_SIZE]; char post_data[MAX_STR_SIZE + 30];
snprintf(post_data, sizeof(post_data), "{\"action\": 3, \"name\": \"%s\"}", name); snprintf(post_data, sizeof(post_data), "{\"action\": 3, \"name\": \"%s\"}", name);