From bd63c0f5b3efd1689a231fccebe74e798e1bbd88 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 23 Jul 2017 11:06:01 +0200 Subject: [PATCH] Fix bug #73528 --- NEWS | 3 +++ ext/mbstring/mbstring.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index cb93080fc3..f786baaed4 100644 --- a/NEWS +++ b/NEWS @@ -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 { -- 2.40.0