1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11:28 +00:00

merge soc07 r5069:5072 - Fix for character case bug in wildtest found by David; Nicer error message for anyone dumb enough to use negative frequency values.

This commit is contained in:
fyodor
2007-08-11 05:08:37 +00:00
parent e26fca0d42
commit c0ad899d57
2 changed files with 5 additions and 2 deletions

View File

@@ -174,6 +174,9 @@ static int nmap_services_init() {
if (res == 3) {
ratio = 0;
} else if (res == 5) {
if (ratio_n < 0 || ratio_d < 0)
fatal("%s:%d contains an invalid negative value", filename, lineno);
if (ratio_n > ratio_d)
fatal("%s:%d has a ratio %g. All ratios must be < 1", filename, lineno, (double)ratio_n/ratio_d);

View File

@@ -128,8 +128,8 @@ int wildtest(char *wild, char *test) {
if (wild[1] == '\0') return 1;
for(i=0; test[i]!='\0'; i++)
if ((wild[1] == test[i] || wild[1] == '?')
&& wildtest(wild+1, test+i) == 1) return 1;
if ((tolower((int)wild[1]) == tolower((int)test[i]) || wild[1] == '?')
&& wildtest(wild+1, test+i) == 1) return 1;
return 0;
}