com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/intl/idn/idn.c
| From: | Christoph Michael Becker | Date: | Tue, 12 Jul 2016 12:52:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/intl/idn/idn.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92964@lists.php.net to get a copy of this message | ||
Commit: 5fbcc2b90f6245cf1c20d41d2cd07fde711ccadd
Author: Christoph M. Becker <cmb@php.net> Tue, 12 Jul 2016 14:51:23 +0200
Parents: aabca89f951984c0a8d68520dfefb499f89735a8 76e249d31c51d0b4f8f11507c550ca1eec1dd38a
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5fbcc2b90f6245cf1c20d41d2cd07fde711ccadd
Log:
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/intl/idn/idn.c
Changed paths:
MM NEWS
MM ext/intl/idn/idn.c
Diff:
diff --cc ext/intl/idn/idn.c
index 6e69960,fb17e34..cb23edd
--- a/ext/intl/idn/idn.c
+++ b/ext/intl/idn/idn.c
@@@ -152,27 -152,23 +152,24 @@@ static void php_intl_idn_to_46(INTERNAL
}
if (mode == INTL_IDN_TO_ASCII) {
- len = uidna_nameToASCII_UTF8(uts46, domain, (int32_t)domain_len,
- buffer, buffer_capac, &info, &status);
+ len = uidna_nameToASCII_UTF8(uts46, domain, domain_len,
+ ZSTR_VAL(buffer), buffer_capac, &info, &status);
} else {
- len = uidna_nameToUnicodeUTF8(uts46, domain, (int32_t)domain_len,
- buffer, buffer_capac, &info, &status);
+ 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 TSRMLS_CC) == FAILURE) {
+ mode) == FAILURE) {
uidna_close(uts46);
- efree(buffer);
+ zend_string_free(buffer);
RETURN_FALSE;
}
- if (len >= 255) {
- php_error_docref(NULL, E_ERROR, "ICU returned an unexpected length");
- }
- buffer[len] = '\0';
+ ZSTR_VAL(buffer)[len] = '\0';
+ ZSTR_LEN(buffer) = len;
if (info.errors == 0) {
- RETVAL_STRINGL(buffer, len, 0);
+ RETVAL_STR(buffer);
buffer_used = 1;
} else {
RETVAL_FALSE;