Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit 26d417d758b4 · 2021-04-11T10:38:07.000+02:00
* PHP-7.4:
  Fix gidlist allocation leak on error
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
@@ -300,6 +300,7 @@ PHP_FUNCTION(posix_getgroups)
 	gidlist = emalloc(sizeof(gid_t) * result);
 	if ((result = getgroups(result, gidlist)) < 0) {
 		POSIX_G(last_error) = errno;
+		efree(gidlist);
 		RETURN_FALSE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,7 @@ PHP_FUNCTION(posix_getgroups)`
`300`	`300`	`gidlist = emalloc(sizeof(gid_t) * result);`
`301`	`301`	`if ((result = getgroups(result, gidlist)) < 0) {`
`302`	`302`	`POSIX_G(last_error) = errno;`
	`303`	`+ efree(gidlist);`
`303`	`304`	`RETURN_FALSE;`
`304`	`305`	`}`
`305`	`306`