lregex: add assertions for setting mgroup= flag

masatake · masatake · commit ad1e5080d9b6 · 2022-10-22T14:59:46.000+09:00
Signed-off-by: Masatake YAMATO &lt;yamato@redhat.com&gt;
diff --git a/main/lregex.c b/main/lregex.c
@@ -1979,6 +1979,7 @@ static bool matchMultilineRegexPattern (struct lregexControlBlock *lcb,
 
 		if (patbuf->type == PTRN_TAG)
 		{
+			Assert (mgroup->forLineNumberDetermination != NO_MULTILINE);
 			off_t offset = (current + pmatch [mgroup->forLineNumberDetermination].rm_so)
 				- start;
 			matchTagPattern (lcb, current, patbuf, pmatch, offset,
@@ -2777,6 +2778,7 @@ static struct regexTable * matchMultitableRegexTable (struct lregexControlBlock
 
 			if (ptrn->type == PTRN_TAG)
 			{
+				Assert (ptrn->mgroup.forLineNumberDetermination != NO_MULTILINE);
 				off_t offset_for_tag = (current
 										+ pmatch [ptrn->mgroup.forLineNumberDetermination].rm_so)
 					- cstart;

Original file line number	Diff line number	Diff line change
`@@ -1979,6 +1979,7 @@ static bool matchMultilineRegexPattern (struct lregexControlBlock *lcb,`
`1979`	`1979`
`1980`	`1980`	`if (patbuf->type == PTRN_TAG)`
`1981`	`1981`	`{`
	`1982`	`+ Assert (mgroup->forLineNumberDetermination != NO_MULTILINE);`
`1982`	`1983`	`off_t offset = (current + pmatch [mgroup->forLineNumberDetermination].rm_so)`
`1983`	`1984`	`- start;`
`1984`	`1985`	`matchTagPattern (lcb, current, patbuf, pmatch, offset,`
`@@ -2777,6 +2778,7 @@ static struct regexTable * matchMultitableRegexTable (struct lregexControlBlock`
`2777`	`2778`
`2778`	`2779`	`if (ptrn->type == PTRN_TAG)`
`2779`	`2780`	`{`
	`2781`	`+ Assert (ptrn->mgroup.forLineNumberDetermination != NO_MULTILINE);`
`2780`	`2782`	`off_t offset_for_tag = (current`
`2781`	`2783`	`+ pmatch [ptrn->mgroup.forLineNumberDetermination].rm_so)`
`2782`	`2784`	`- cstart;`