Fix bug #73528

diff --git a/NEWS b/NEWS
index cb93080fc38632a7ca85292b23b6a7e21d758551..f786baaed4ecbdaf715b694d804873dd7e5a8966 100644 (file)
--- 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 f7a9bacdb0ef2cce03909cb17e1c1749940e8fc4..6ba99d50d0368107472089bab56b42559b27bff7 100644 (file)
--- 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 {