Fixed bug 71397 (mb_send_mail segmentation fault)

diff --git a/NEWS b/NEWS
index d18dada1588467ea673c34e8a5f725657c0ac89c..5ebb263b49c38903a0502216b3334f50b7601e20 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)
 
+- Mbstring:
+  . Fixed bug #71397 (mb_send_mail segmentation fault). (Tim Düsterhus)
+
 - SOAP:
   . Fixed bug #70979 (crash with bad soap request). (Anatol)
   

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 4fdb3d5b2e571271fc67feb10f93bb024ce1cb83..b5812cb402f0b61ffa25cec46bf1e41576268a62 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4145,9 +4145,10 @@ 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;
 
+               ZEND_ASSERT(Z_TYPE_P(s) == IS_STRING);
                _body_enc = mbfl_name2no_encoding(Z_STRVAL_P(s));
                switch (_body_enc) {
                        case mbfl_no_encoding_base64: