diff options
| author | Tim Düsterhus <tim@bastelstu.be> | 2016-01-17 15:03:47 +0100 |
|---|---|---|
| committer | Tim Düsterhus <tim@bastelstu.be> | 2016-01-17 15:30:09 +0100 |
| commit | e585696a0b9d9eefefffa74249f751cfbe6e1222 (patch) | |
| tree | da63e47ad698842822bfa3479a1253ef7ea2a4e1 | |
| parent | 8052df8110cfa1dce89c962ef9f8f632a26fbcc7 (diff) | |
| download | php-git-e585696a0b9d9eefefffa74249f751cfbe6e1222.tar.gz | |
Fixed bug 71397 (mb_send_mail segmentation fault)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -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 4fdb3d5b2e..b5812cb402 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: |