Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix buffer allocations in zlog_stream_set_msg_suffix()

Author: cmb69

sapi/fpm/fpm/zlog.c

@@ -637,10 +637,10 @@ zlog_bool zlog_stream_set_msg_suffix(
 	if (suffix != NULL) {
 		stream->msg_suffix_len = strlen(suffix);
 		len = stream->msg_suffix_len + 1;
-		stream->msg_suffix = malloc(len);
 		if (stream->msg_suffix != NULL) {
 			free(stream->msg_suffix);
 		}
+		stream->msg_suffix = malloc(len);
 		if (stream->msg_suffix == NULL) {
 			return ZLOG_FALSE;
 		}
@@ -650,10 +650,10 @@ zlog_bool zlog_stream_set_msg_suffix(
 	if (final_suffix != NULL) {
 		stream->msg_final_suffix_len = strlen(final_suffix);
 		len = stream->msg_final_suffix_len + 1;
-		stream->msg_final_suffix = malloc(len);
 		if (stream->msg_final_suffix != NULL) {
 			free(stream->msg_suffix);
 		}
+		stream->msg_final_suffix = malloc(len);
 		if (stream->msg_final_suffix == NULL) {
 			return ZLOG_FALSE;
 		}