aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge remote-tracking branch 'gitlab/security'

Browse Source
This commit is contained in:
Ailin Nemui 2017-06-05 15:12:16 +02:00
commit fb08fc7f1a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/irc/dcc/dcc-get.c
View File

@ -382,6 +382,8 @@ int get_file_params_count(char **params, int paramcount)
if (*params[0] == '"') { if (*params[0] == '"') {
/* quoted file name? */ /* quoted file name? */
for (pos = 0; pos < paramcount-3; pos++) { for (pos = 0; pos < paramcount-3; pos++) {
if (strlen(params[pos]) == 0)
continue;
if (params[pos][strlen(params[pos])-1] == '"' && if (params[pos][strlen(params[pos])-1] == '"' &&
get_params_match(params, pos+1)) get_params_match(params, pos+1))
return pos+1; return pos+1;
@ -428,6 +430,10 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
int p_id = -1; int p_id = -1;
int passive = FALSE; int passive = FALSE;
if (addr == NULL) {
addr = "";
}
/* SEND <file name> <address> <port> <size> [...] */ /* SEND <file name> <address> <port> <size> [...] */
/* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */ /* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */
params = g_strsplit(data, " ", -1); params = g_strsplit(data, " ", -1);

2
src/irc/dcc/dcc-resume.c
View File

@ -62,6 +62,8 @@ int get_file_params_count_resume(char **params, int paramcount)
if (*params[0] == '"') { if (*params[0] == '"') {
/* quoted file name? */ /* quoted file name? */
for (pos = 0; pos < paramcount-2; pos++) { for (pos = 0; pos < paramcount-2; pos++) {
if (strlen(params[pos]) == 0)
continue;
if (params[pos][strlen(params[pos])-1] == '"' && if (params[pos][strlen(params[pos])-1] == '"' &&
get_params_match_resume(params, pos+1)) get_params_match_resume(params, pos+1))
return pos+1; return pos+1;