Merge branch 'PHP-8.0' into PHP-8.1

Author: bukka

sapi/fpm/fpm/fpm_sockets.c

@@ -65,10 +65,18 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
 			close(ls->sock);
 		} else { /* on PARENT EXEC we want socket fds to be inherited through environment variable */
 			char fd[32];
+			char *tmpenv_value;
 			sprintf(fd, "%d", ls->sock);
 
 			socket_set_buf = (i % FPM_ENV_SOCKET_SET_SIZE == 0 && i) ? 1 : 0;
-			env_value = realloc(env_value, p + (p ? 1 : 0) + strlen(ls->key) + 1 + strlen(fd) + socket_set_buf + 1);
+			tmpenv_value = realloc(env_value, p + (p ? 1 : 0) + strlen(ls->key) + 1 + strlen(fd) + socket_set_buf + 1);
+			if (!tmpenv_value) {
+				zlog(ZLOG_SYSERROR, "failure to inherit data on parent exec for socket `%s` due to memory allocation failure", ls->key);
+				free(ls->key);
+				break;
+			}
+
+			env_value = tmpenv_value;
 
 			if (i % FPM_ENV_SOCKET_SET_SIZE == 0) {
 				socket_set[socket_set_count] = p + socket_set_buf;

sapi/fpm/fpm/zlog.c

@@ -348,7 +348,7 @@ static ssize_t zlog_stream_direct_write(
 static inline ssize_t zlog_stream_unbuffered_write(
 		struct zlog_stream *stream, const char *buf, size_t len) /* {{{ */
 {
-	const char *append;
+	const char *append = NULL;
 	size_t append_len = 0, required_len, reserved_len;
 	ssize_t written;