diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-04-29 22:09:04 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-04-29 22:09:04 -0700 |
| commit | 2c3933821fe2d401ae128f25047935671c43dd98 (patch) | |
| tree | afb4754c63bd7f91678e4cdd8af8defba2ffd88b | |
| parent | 18a9ae412f00cc1e312c296952fac24f16b4d4de (diff) | |
| parent | 6c631ccfef94f93259d474682f8bfa803e163c87 (diff) | |
| download | php-git-2c3933821fe2d401ae128f25047935671c43dd98.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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 62d710589d..c171eba950 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -261,8 +261,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; @@ -276,8 +277,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); @@ -293,8 +294,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; |