mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
Merge remote-tracking branch 'gitlab/security'
This commit is contained in:
commit
fb08fc7f1a
@ -382,6 +382,8 @@ int get_file_params_count(char **params, int paramcount)
|
||||
if (*params[0] == '"') {
|
||||
/* quoted file name? */
|
||||
for (pos = 0; pos < paramcount-3; pos++) {
|
||||
if (strlen(params[pos]) == 0)
|
||||
continue;
|
||||
if (params[pos][strlen(params[pos])-1] == '"' &&
|
||||
get_params_match(params, 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 passive = FALSE;
|
||||
|
||||
if (addr == NULL) {
|
||||
addr = "";
|
||||
}
|
||||
|
||||
/* SEND <file name> <address> <port> <size> [...] */
|
||||
/* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */
|
||||
params = g_strsplit(data, " ", -1);
|
||||
|
@ -62,6 +62,8 @@ int get_file_params_count_resume(char **params, int paramcount)
|
||||
if (*params[0] == '"') {
|
||||
/* quoted file name? */
|
||||
for (pos = 0; pos < paramcount-2; pos++) {
|
||||
if (strlen(params[pos]) == 0)
|
||||
continue;
|
||||
if (params[pos][strlen(params[pos])-1] == '"' &&
|
||||
get_params_match_resume(params, pos+1))
|
||||
return pos+1;
|
||||
|
Loading…
Reference in New Issue
Block a user