diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-01-20 10:55:09 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-01-20 10:55:09 +0000 |
| commit | 7d100866ec2aa941555b4616dedae69d935c601b (patch) | |
| tree | f3f717da8c02ce89957e17980fb56596b9c7e464 /ext/mbstring/mbstring.c | |
| parent | 11cf826b8960f0d9af5368b1af90ac3f81947f16 (diff) | |
| parent | d284072f787595df4d687ed5dc605f655206b31e (diff) | |
| download | php-git-7d100866ec2aa941555b4616dedae69d935c601b.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 3 |
1 files changed, 2 insertions, 1 deletions
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: |