patch 7.4.937

brammool · brammool · commit 5ad075c0735d · 2015-11-24T15:18:32.000+01:00
Problem: Segfault reading unitialized memory. Solution: Do not read match \z0, it does not exist. (Marius Gedminas, closes #497)
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
@@ -6947,7 +6947,8 @@ nfa_regtry(prog, col, tm)
     {
 	cleanup_zsubexpr();
 	re_extmatch_out = make_extmatch();
-	for (i = 0; i < subs.synt.in_use; i++)
+	/* Loop over \z1, \z2, etc.  There is no \z0. */
+	for (i = 1; i < subs.synt.in_use; i++)
 	{
 	    if (REG_MULTI)
 	    {
diff --git a/src/version.c b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    937,
 /**/
     936,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -6947,7 +6947,8 @@ nfa_regtry(prog, col, tm)`
`6947`	`6947`	`{`
`6948`	`6948`	`cleanup_zsubexpr();`
`6949`	`6949`	`re_extmatch_out = make_extmatch();`
`6950`		`- for (i = 0; i < subs.synt.in_use; i++)`
	`6950`	`+ /* Loop over \z1, \z2, etc. There is no \z0. */`
	`6951`	`+ for (i = 1; i < subs.synt.in_use; i++)`
`6951`	`6952`	`{`
`6952`	`6953`	`if (REG_MULTI)`
`6953`	`6954`	`{`