CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 06:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the checking of argument counts and types for the $P and $SUBST

Browse source 
substitutions more explicit. Formerly the number of arguments was
checked implicitly by checking their type (that they had a specific type
and were not SUBSTARGS_ARGTYPE_NONE), but this makes it clearer.
This commit is contained in:
david 2009-08-29 15:21:52 +00:00
parent 5136ad0668
commit c7abca3a2e
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
service_scan.cc
View file

@ -618,8 +618,10 @@ static int substvar(char *tmplvar, char **tmplvarend, char *newstr,
memcpy(newstr, subject + offstart, len);
byteswritten = len;
} else if (strcmp(substcommand, "P") == 0) {
if (command_args.arg_types[0] != SUBSTARGS_ARGTYPE_INT)
if (command_args.num_args != 1 ||
command_args.arg_types[0] != SUBSTARGS_ARGTYPE_INT) {
return -1;
}
subnum = command_args.int_args[0];
if (subnum > 9 || subnum <= 0) return -1;
if (subnum >= nummatches) return -1;
@ -639,8 +641,12 @@ static int substvar(char *tmplvar, char **tmplvarend, char *newstr,
} else if (strcmp(substcommand, "SUBST") == 0) {
char *findstr, *replstr;
int findstrlen, replstrlen;
if (command_args.arg_types[0] != SUBSTARGS_ARGTYPE_INT)
if (command_args.num_args != 3 ||
command_args.arg_types[0] != SUBSTARGS_ARGTYPE_INT ||
command_args.arg_types[1] != SUBSTARGS_ARGTYPE_STRING ||
command_args.arg_types[2] != SUBSTARGS_ARGTYPE_STRING) {
return -1;
}
subnum = command_args.int_args[0];
if (subnum > 9 || subnum <= 0) return -1;
if (subnum >= nummatches) return -1;
@ -648,9 +654,6 @@ static int substvar(char *tmplvar, char **tmplvarend, char *newstr,
offend = ovector[subnum * 2 + 1];
assert(offstart >= 0 && offstart < subjectlen);
assert(offend >= 0 && offend <= subjectlen);
if (command_args.arg_types[1] != SUBSTARGS_ARGTYPE_STRING ||
command_args.arg_types[2] != SUBSTARGS_ARGTYPE_STRING)
return -1;
findstr = command_args.str_args[1];
findstrlen = command_args.str_args_len[1];
replstr = command_args.str_args[2];