Merge branch 'PHP-8.0' into PHP-8.1

cmb69 · cmb69 · commit 2b075131924d · 2022-01-08T21:06:39.000+01:00
* PHP-8.0:
  Fix memory leak on invalid port
diff --git a/NEWS b/NEWS
@@ -2,7 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.3
 
-
+- FPM:
+  . Fixed memory leak on invalid port. (David Carlier)
 
 06 Jan 2022, PHP 8.1.2RC1
 
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
@@ -336,6 +336,7 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
 
 	if (port == 0) {
 		zlog(ZLOG_ERROR, "invalid port value '%s'", port_str);
+		free(dup_address);
 		return -1;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,7 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s wp) /`
`336`	`336`
`337`	`337`	`if (port == 0) {`
`338`	`338`	`zlog(ZLOG_ERROR, "invalid port value '%s'", port_str);`
	`339`	`+ free(dup_address);`
`339`	`340`	`return -1;`
`340`	`341`	`}`
`341`	`342`