Skip to content

Commit 9fccc56

Browse files
committed
zlog: fix free, fpm_conf: set NULL after free
1 parent 3e128ee commit 9fccc56

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

sapi/fpm/fpm/fpm_conf.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,10 @@ int fpm_conf_load_ini_file(char *filename) /* {{{ */
16301630
tmp = zend_parse_ini_string(buf, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)fpm_conf_ini_parser, &error);
16311631
ini_filename = filename;
16321632
if (error || tmp == FAILURE) {
1633-
if (ini_include) free(ini_include);
1633+
if (ini_include) {
1634+
free(ini_include);
1635+
ini_include = NULL;
1636+
}
16341637
ini_recursion--;
16351638
close(fd);
16361639
free(buf);

sapi/fpm/fpm/zlog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ zlog_bool zlog_stream_set_msg_suffix(
645645
stream->msg_final_suffix_len = strlen(final_suffix);
646646
len = stream->msg_final_suffix_len + 1;
647647
if (stream->msg_final_suffix != NULL) {
648-
free(stream->msg_suffix);
648+
free(stream->msg_final_suffix);
649649
}
650650
stream->msg_final_suffix = malloc(len);
651651
if (stream->msg_final_suffix == NULL) {

0 commit comments

Comments
 (0)