com php-src: Merge branch 'PHP-7.2': ext/mbstring/libmbfl/mbfl/ mbfl_convert.c ext/mbstring/mbstring.c

From: Date: Thu, 03 Aug 2017 19:57:35 +0000
Subject: com php-src: Merge branch 'PHP-7.2': ext/mbstring/libmbfl/mbfl/ mbfl_convert.c ext/mbstring/mbstring.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98938@lists.php.net to get a copy of this message
Commit: c98714f19e6f033a7b45a24cf73fc9460cee3254 Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 3 Aug 2017 21:57:35 +0200 Parents: 3d948d77d112684781fd81e7124350d3a32e5245 fb9bf5b64b6c09b9d93bbd1dadd64884e0af66f3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c98714f19e6f033a7b45a24cf73fc9460cee3254 Log: Merge branch 'PHP-7.2' Changed paths: MM ext/mbstring/libmbfl/mbfl/mbfl_convert.c MM ext/mbstring/mbstring.c Diff: diff --cc ext/mbstring/mbstring.c index 584523e,9b9458a..a5430b4 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@@ -966,10 -933,11 +966,11 @@@ static size_t php_mb_zend_encoding_conv string.len = from_length; /* initialize converter */ - convd = mbfl_buffer_converter_new2((const mbfl_encoding *)encoding_from, (const mbfl_encoding *)encoding_to, string.len); + convd = mbfl_buffer_converter_new((const mbfl_encoding *)encoding_from, (const mbfl_encoding *)encoding_to, string.len); if (convd == NULL) { - return -1; + return (size_t) -1; } + mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode)); mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar)); @@@ -3027,68 -3185,6 +3028,48 @@@ static inline zend_bool php_mb_is_no_en return (no_enc >= mbfl_no_encoding_utf8 && no_enc <= mbfl_no_encoding_utf8_sb); } +MBSTRING_API char *php_mb_convert_encoding_ex(const char *input, size_t length, const mbfl_encoding *to_encoding, const mbfl_encoding *from_encoding, size_t *output_len) +{ + mbfl_string string, result, *ret; + mbfl_buffer_converter *convd; + char *output = NULL; + + if (output_len) { + *output_len = 0; + } + + /* initialize string */ + mbfl_string_init(&string); + mbfl_string_init(&result); + string.encoding = from_encoding; + string.no_language = MBSTRG(language); + string.val = (unsigned char *)input; + string.len = length; + + /* initialize converter */ + convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len); + if (convd == NULL) { + php_error_docref(NULL, E_WARNING, "Unable to create character encoding converter"); + return NULL; + } + + mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode)); - if (string.encoding == MBSTRG(current_internal_encoding)) { - mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar)); - } else if (php_mb_is_no_encoding_unicode(string.encoding->no_encoding) - && php_mb_is_no_encoding_unicode(MBSTRG(current_internal_encoding)->no_encoding)) { - - if (php_mb_is_no_encoding_utf8(string..encoding->no_encoding)) { - if (MBSTRG(current_filter_illegal_substchar) > 0xd7ff && - 0xe000 > MBSTRG(current_filter_illegal_substchar) - ) { - mbfl_buffer_converter_illegal_substchar(convd, 0x3f); - } else { - mbfl_buffer_converter_illegal_substchar(convd, - MBSTRG(current_filter_illegal_substchar)); - } - } else { - mbfl_buffer_converter_illegal_substchar(convd, - MBSTRG(current_filter_illegal_substchar)); - } - } else { - mbfl_buffer_converter_illegal_substchar(convd, 0x3f); - } ++ mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar)); + + /* do it */ + ret = mbfl_buffer_converter_feed_result(convd, &string, &result); + if (ret) { + if (output_len) { + *output_len = ret->len; + } + output = (char *)ret->val; + } + + MBSTRG(illegalchars) += mbfl_buffer_illegalchars(convd); + mbfl_buffer_converter_delete(convd); + return output; +} +/* }}} */ /* {{{ MBSTRING_API char *php_mb_convert_encoding() */ MBSTRING_API char *php_mb_convert_encoding(const char *input, size_t length, const char *_to_encoding, const char *_from_encodings, size_t *output_len)

« previous php.cvs (#98938) next »