From: Yasuo Ohgaki <yohgaki@php.net>
Date: Mon, 18 Jan 2016 00:22:04 +0000 (+0900)
Subject: Fixed bug #71397 (mb_send_mail segmentation fault)
X-Git-Tag: php-7.0.3RC1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff10dceff87f4c94c55e6bc2e962f4bb3d66feb4;p=php

Fixed bug #71397 (mb_send_mail segmentation fault)
---

diff --git a/NEWS b/NEWS
index d18dada158..e25d793b97 100644
--- 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)
   
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 4fdb3d5b2e..be4b1e4912 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -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));