zlog: fix free, fpm_conf: set NULL after free #8785
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bukka
requested changes
Jun 15, 2022
sapi/fpm/fpm/fpm_conf.c
Outdated
Comment on lines
1633
to
1636
| if (ini_include) { | ||
| free(ini_include); | ||
| ini_include = NULL; | ||
| } |
There was a problem hiding this comment.
This looks like a correct and complete fix. Nice catch.
| @@ -645,7 +645,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); | |||
There was a problem hiding this comment.
This is even better catch. It's correct for the only used call of this function and I think it might be potentially reason for #8517 although not 100% sure about it. Anyway we should definitely fix this. It might need to be slightly changed logic (possibly later) as that function has got some logic that if you pass suffix as well as final_suffix, then final suffix is part of allocated suffix (see above) - that's the actual reason of this bug being introduced. However that path is not used so it will always be allocated below.
|
2nd PR is #8794 |
|
Can you squash it to a single commit pls? |
Revert "zlog: fix free“. will be in another PR This reverts commit 9fccc56.
|
Fix already applied 325ca31 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.