diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-12 14:51:23 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-12 14:52:23 +0200 |
| commit | 5fbcc2b90f6245cf1c20d41d2cd07fde711ccadd (patch) | |
| tree | 9dba25ece0d9d20383d719116c6fc75092019494 /ext/intl/idn | |
| parent | aabca89f951984c0a8d68520dfefb499f89735a8 (diff) | |
| parent | 76e249d31c51d0b4f8f11507c550ca1eec1dd38a (diff) | |
| download | php-git-5fbcc2b90f6245cf1c20d41d2cd07fde711ccadd.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/intl/idn/idn.c
Diffstat (limited to 'ext/intl/idn')
| -rw-r--r-- | ext/intl/idn/idn.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 6e699604df..cb23edd0c5 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -158,15 +158,12 @@ static void php_intl_idn_to_46(INTERNAL_FUNCTION_PARAMETERS, len = uidna_nameToUnicodeUTF8(uts46, domain, domain_len, ZSTR_VAL(buffer), buffer_capac, &info, &status); } - if (php_intl_idn_check_status(status, "failed to convert name", + if (len >= 255 || php_intl_idn_check_status(status, "failed to convert name", mode) == FAILURE) { uidna_close(uts46); zend_string_free(buffer); RETURN_FALSE; } - if (len >= 255) { - php_error_docref(NULL, E_ERROR, "ICU returned an unexpected length"); - } ZSTR_VAL(buffer)[len] = '\0'; ZSTR_LEN(buffer) = len; |