com php-src: Fixed bug 71397 (mb_send_mail segmentation fault): NEWS ext/mbstring/mbstring.c

Commit: e585696a0b9d9eefefffa74249f751cfbe6e1222 Author: Tim Düsterhus <tim@bastelstu.be> Sun, 17 Jan 2016 15:03:47 +0100 Parents: 8052df8110cfa1dce89c962ef9f8f632a26fbcc7 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e585696a0b9d9eefefffa74249f751cfbe6e1222 Log: Fixed bug 71397 (mb_send_mail segmentation fault) Bugs: https://bugs.php.net/71397 Changed paths: M NEWS M ext/mbstring/mbstring.c Diff: diff --git a/NEWS b/NEWS index d18dada..5ebb263 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) +- 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 4fdb3d5..b5812cb 100644 --- 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: