com php-src: Fix bug #73528: NEWS ext/mbstring/mbstring.c
| From: | Nikita Popov | Date: | Sun, 23 Jul 2017 09:55:43 +0000 |
| Subject: | com php-src: Fix bug #73528: NEWS ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98743@lists.php.net to get a copy of this message | ||
Commit: bd63c0f5b3efd1689a231fccebe74e798e1bbd88
Author: Nikita Popov <nikita.ppv@gmail.com> Sun, 23 Jul 2017 11:06:01 +0200
Parents: 80463579ce307dd9b748c8c0dc503a52b91657ad
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bd63c0f5b3efd1689a231fccebe74e798e1bbd88
Log:
Fix bug #73528
Bugs:
https://bugs.php.net/73528
Changed paths:
M NEWS
M ext/mbstring/mbstring.c
Diff:
diff --git a/NEWS b/NEWS
index cb93080..f786baa 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 f7a9bac..6ba99d5 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 {