mirror of
https://github.com/irssi/irssi.git
synced 2024-11-03 04:27:19 -05:00
Merge branch 'fix-gl8' into 'security'
Fix oob read of one byte in get_file_params_count See merge request !12
This commit is contained in:
commit
84503427b0
@ -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;
|
||||
|
@ -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