]> granicus.if.org Git - php/commitdiff
Fixed bug #71397 (mb_send_mail segmentation fault)
authorYasuo Ohgaki <yohgaki@php.net>
Mon, 18 Jan 2016 00:22:04 +0000 (09:22 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Mon, 18 Jan 2016 00:23:20 +0000 (09:23 +0900)
NEWS
ext/mbstring/mbstring.c

diff --git a/NEWS b/NEWS
index d18dada1588467ea673c34e8a5f725657c0ac89c..e25d793b971e1766b8e27012d3e87bb43f248373 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@ PHP                                                                        NEWS
   . Fixed bug #71249 (ldap_mod_replace/ldap_mod_add store value as string
     "Array"). (Laruence)
 
+- mbsgring:
+  . Fixed bug #71397 (mb_send_mail segmentation fault). (Yasuo)
+
 - SOAP:
   . Fixed bug #70979 (crash with bad soap request). (Anatol)
   
index 4fdb3d5b2e571271fc67feb10f93bb024ce1cb83..be4b1e491296f13671f0433d02a0e2d617df3d0f 100644 (file)
@@ -4145,7 +4145,7 @@ PHP_FUNCTION(mb_send_mail)
                suppressed_hdrs.cnt_type = 1;
        }
 
-       if ((s = zend_hash_str_find_ptr(&ht_headers, "CONTENT-TRANSFER-ENCODING", sizeof("CONTENT-TRANSFER-ENCODING") - 1))) {
+       if ((s = zend_hash_str_find(&ht_headers, "CONTENT-TRANSFER-ENCODING", sizeof("CONTENT-TRANSFER-ENCODING") - 1))) {
                enum mbfl_no_encoding _body_enc;
 
                _body_enc = mbfl_name2no_encoding(Z_STRVAL_P(s));