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

Michael Meskes · Michael Meskes · commit 12c42a543ac8 · 2019-04-11T21:06:21.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
@@ -1376,7 +1376,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
`@@ -1376,7 +1376,7 @@ parse_include(void)`
`1376`	`1376`
`1377`	`1377`	`for (ip = include_paths; yyin == NULL && ip != NULL; ip = ip->next)`
`1378`	`1378`	`{`
`1379`		`- if (strlen(ip->path) + strlen(yytext) + 3 > MAXPGPATH)`
	`1379`	`+ if (strlen(ip->path) + strlen(yytext) + 4 > MAXPGPATH)`
`1380`	`1380`	`{`
`1381`	`1381`	`fprintf(stderr, _("Error: include path \"%s/%s\" is too long on line %d, skipping\n"), ip->path, yytext, yylineno);`
`1382`	`1382`	`continue;`