FPM: zlog, fix free on wrong address for message prepend.

hwde · devnexen · commit 325ca31dcf80 · 2022-06-27T23:34:58.000+01:00
diff --git a/NEWS b/NEWS
@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed bug #80047 (DatePeriod doesn't warn with custom DateTimeImmutable).
     (Derick)
 
+- FPM:
+  . Fixed zlog message prepend, free on incorrect address. (Heiko Weber)
+
 - GD:
   . Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument).
     (cmb)
diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c
@@ -651,7 +651,7 @@ zlog_bool zlog_stream_set_msg_suffix(
 		stream->msg_final_suffix_len = strlen(final_suffix);
 		len = stream->msg_final_suffix_len + 1;
 		if (stream->msg_final_suffix != NULL) {
-			free(stream->msg_suffix);
+			free(stream->msg_final_suffix);
 		}
 		stream->msg_final_suffix = malloc(len);
 		if (stream->msg_final_suffix == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ zlog_bool zlog_stream_set_msg_suffix(`
`651`	`651`	`stream->msg_final_suffix_len = strlen(final_suffix);`
`652`	`652`	`len = stream->msg_final_suffix_len + 1;`
`653`	`653`	`if (stream->msg_final_suffix != NULL) {`
`654`		`- free(stream->msg_suffix);`
	`654`	`+ free(stream->msg_final_suffix);`
`655`	`655`	`}`
`656`	`656`	`stream->msg_final_suffix = malloc(len);`
`657`	`657`	`if (stream->msg_final_suffix == NULL) {`