Fix #80220: imap_mail_compose() may leak memory #6321
Closed
Conversation
This file contains hidden or 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
Unless `topbod` is of `TYPEMULTIPART`, `mail_free_body()` does not free the `nested.part`; while we could do this ourselves, instead we just ignore additional bodies in this case, i.e. we don't attach them in the first place.
nikic
reviewed
Oct 12, 2020
| @@ -3714,7 +3714,7 @@ PHP_FUNCTION(imap_mail_compose) | |||
| convert_to_string_ex(pvalue); | |||
| bod->md5 = cpystr(Z_STRVAL_P(pvalue)); | |||
| } | |||
| } else if (Z_TYPE_P(data) == IS_ARRAY) { | |||
| } else if (Z_TYPE_P(data) == IS_ARRAY && topbod->type == TYPEMULTIPART) { | |||
There was a problem hiding this comment.
This is basically the reverse of the "cannot generate multipart e-mail without components" error below, so might make sense to have symmetric treatment. I don't particularly care though.
There was a problem hiding this comment.
So far there is no warning, and the memory leak is relatively harmless. So maybe only warn for PHP 8.0+?
There was a problem hiding this comment.
Eh, it's ext/imap, probably not worth the bother...
There was a problem hiding this comment.
Well, we should do something about that. :)
nikic
approved these changes
Oct 12, 2020
| @@ -3714,7 +3714,7 @@ PHP_FUNCTION(imap_mail_compose) | |||
| convert_to_string_ex(pvalue); | |||
| bod->md5 = cpystr(Z_STRVAL_P(pvalue)); | |||
| } | |||
| } else if (Z_TYPE_P(data) == IS_ARRAY) { | |||
| } else if (Z_TYPE_P(data) == IS_ARRAY && topbod->type == TYPEMULTIPART) { | |||
There was a problem hiding this comment.
Eh, it's ext/imap, probably not worth the bother...
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.
Unless
topbodis ofTYPEMULTIPART,mail_free_body()does not freethe
nested.part; while we could do this ourselves, instead we justignore additional bodies in this case, i.e. we don't attach them in the
first place.