diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-07-23 11:06:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-07-23 11:55:43 +0200 |
| commit | bd63c0f5b3efd1689a231fccebe74e798e1bbd88 (patch) | |
| tree | c4effb692369e45e56ef89a5fab68003ca62def1 | |
| parent | 80463579ce307dd9b748c8c0dc503a52b91657ad (diff) | |
| download | php-git-bd63c0f5b3efd1689a231fccebe74e798e1bbd88.tar.gz | |
Fix bug #73528
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -11,6 +11,9 @@ PHP NEWS . Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay. (Come) +- Mbstring: + . Fixed bug #73528 (Crash in zif_mb_send_mail). (Nikita) + - ODBC: . Removed support for Birdstep. (Kalle) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index f7a9bacdb0..6ba99d50d0 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -4315,7 +4315,6 @@ out: PHP_FUNCTION(mb_send_mail) { - size_t n; char *to; size_t to_len; char *message; @@ -4325,7 +4324,7 @@ PHP_FUNCTION(mb_send_mail) zval *headers = NULL; zend_string *extra_cmd = NULL; zend_string *str_headers = NULL, *tmp_headers; - int i; + size_t n, i; char *to_r = NULL; char *force_extra_parameters = INI_STR("mail.force_extra_parameters"); struct { |