Fix off-by-one check that can lead to a memory overflow in ecpg.

Michael Meskes · Michael Meskes · commit ed16ba3248d4 · 2019-04-11T20:56:17.000+02:00
Patch by Liu Huailing &lt;liuhuailing@cn.fujitsu.com&gt;
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
@@ -1556,7 +1556,7 @@ parse_include(void)
 
 		for (ip = include_paths; yyin == NULL && ip != NULL; ip = ip->next)
 		{
-			if (strlen(ip->path) + strlen(yytext) + 3 > MAXPGPATH)
+			if (strlen(ip->path) + strlen(yytext) + 4 > MAXPGPATH)
 			{
 				fprintf(stderr, _("Error: include path \"%s/%s\" is too long on line %d, skipping\n"), ip->path, yytext, yylineno);
 				continue;

Original file line number	Diff line number	Diff line change
`@@ -1556,7 +1556,7 @@ parse_include(void)`
`1556`	`1556`
`1557`	`1557`	`for (ip = include_paths; yyin == NULL && ip != NULL; ip = ip->next)`
`1558`	`1558`	`{`
`1559`		`- if (strlen(ip->path) + strlen(yytext) + 3 > MAXPGPATH)`
	`1559`	`+ if (strlen(ip->path) + strlen(yytext) + 4 > MAXPGPATH)`
`1560`	`1560`	`{`
`1561`	`1561`	`fprintf(stderr, _("Error: include path \"%s/%s\" is too long on line %d, skipping\n"), ip->path, yytext, yylineno);`
`1562`	`1562`	`continue;`