diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-04-29 22:09:15 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-04-29 22:09:15 -0700 |
| commit | f7d59844e159e2433c0d020b545db16ac46717d0 (patch) | |
| tree | bd2ea0885a472a6c6745c3ae17eed3bacef7849f | |
| parent | 8cdd2158949994f110188818e84b54db9a0ed4d1 (diff) | |
| parent | 506a764089ba82457345b334bfb0b8d80727ae2f (diff) | |
| download | php-git-f7d59844e159e2433c0d020b545db16ac46717d0.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77821: Potential heap corruption in TSendMail()
| -rw-r--r-- | win32/sendmail.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c index fc901308ba..6a685ee477 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -252,8 +252,9 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message, } if (!found) { - if (headers_lc) { - zend_string_free(headers_lc); + if (headers) { + zend_string_release(headers_trim); + zend_string_release(headers_lc); } *error = W32_SM_SENDMAIL_FROM_NOT_SET; return FAILURE; @@ -267,8 +268,8 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message, efree(RPath); } if (headers) { - zend_string_free(headers_trim); - zend_string_free(headers_lc); + zend_string_release(headers_trim); + zend_string_release(headers_lc); } /* 128 is safe here, the specifier in snprintf isn't longer than that */ *error_message = ecalloc(1, HOST_NAME_LEN + 128); @@ -284,8 +285,8 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message, efree(RPath); } if (headers) { - zend_string_free(headers_trim); - zend_string_free(headers_lc); + zend_string_release(headers_trim); + zend_string_release(headers_lc); } if (ret != SUCCESS) { *error = ret; |