CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 08:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Avoid assertion failure when match capture at end of text is empty.

Browse source 
First reported here: https://seclists.org/nmap-dev/2014/q2/105

We handle empty strings just fine, so treat it like that instead of
asserting that the capture must start before the end of the string.
This commit is contained in:
dmiller 2020-10-15 20:03:33 +00:00
parent 922b8cbbc4
commit 6f335b8fc9
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
service_scan.cc
View file

@ -731,7 +731,7 @@ static char *substvar(char *tmplvar, char **tmplvarend,
if (subnum >= nummatches) return NULL;
offstart = ovector[subnum * 2];
offend = ovector[subnum * 2 + 1];
assert(offstart >= 0 && offstart < subjectlen);
assert(offstart >= 0 && offstart <= subjectlen);
assert(offend >= 0 && offend <= subjectlen);
// A plain-jane copy
strbuf_append(&result, &n, &len, (const char *) subject + offstart, offend - offstart);
@ -745,7 +745,7 @@ static char *substvar(char *tmplvar, char **tmplvarend,
if (subnum >= nummatches) return NULL;
offstart = ovector[subnum * 2];
offend = ovector[subnum * 2 + 1];
assert(offstart >= 0 && offstart < subjectlen);
assert(offstart >= 0 && offstart <= subjectlen);
assert(offend >= 0 && offend <= subjectlen);
// This filter only includes printable characters. It is particularly
// useful for collapsing unicode text that looks like
@ -768,7 +768,7 @@ static char *substvar(char *tmplvar, char **tmplvarend,
if (subnum >= nummatches) return NULL;
offstart = ovector[subnum * 2];
offend = ovector[subnum * 2 + 1];
assert(offstart >= 0 && offstart < subjectlen);
assert(offstart >= 0 && offstart <= subjectlen);
assert(offend >= 0 && offend <= subjectlen);
findstr = command_args.str_args[1];
findstrlen = command_args.str_args_len[1];
@ -801,7 +801,7 @@ static char *substvar(char *tmplvar, char **tmplvarend,
if (subnum >= nummatches) return NULL;
offstart = ovector[subnum * 2];
offend = ovector[subnum * 2 + 1];
assert(offstart >= 0 && offstart < subjectlen);
assert(offstart >= 0 && offstart <= subjectlen);
// overflow
if (offend - offstart > 8) {