com php-src: Improve fix for bug #76829: ext/intl/idn/idn.c
| From: | Anatol Belski | Date: | Fri, 31 Aug 2018 23:12:06 +0000 |
| Subject: | com php-src: Improve fix for bug #76829: ext/intl/idn/idn.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102953@lists.php.net to get a copy of this message | ||
Commit: 4a43e5fb4f59bd4679f5233cc39f1a5b79820fdf
Author: Anatol Belski <ab@php.net> Sat, 1 Sep 2018 01:12:06 +0200
Parents: b9ca573a1bf62e7fb55e863e2073e29ae94d59eb
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a43e5fb4f59bd4679f5233cc39f1a5b79820fdf
Log:
Improve fix for bug #76829
Bugs:
https://bugs.php.net/76829
Changed paths:
M ext/intl/idn/idn.c
Diff:
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c
index fd05600..1ab1f3f 100644
--- a/ext/intl/idn/idn.c
+++ b/ext/intl/idn/idn.c
@@ -138,8 +138,7 @@ static void php_intl_idn_to_46(INTERNAL_FUNCTION_PARAMETERS,
UErrorCode status = U_ZERO_ERROR;
UIDNA *uts46;
int32_t len;
- int32_t buffer_capac = 252*4; /* no domain name may exceed this */
- zend_string *buffer = zend_string_alloc(buffer_capac, 0);
+ zend_string *buffer;
UIDNAInfo info = UIDNA_INFO_INITIALIZER;
int buffer_used = 0;
@@ -150,16 +149,25 @@ static void php_intl_idn_to_46(INTERNAL_FUNCTION_PARAMETERS,
}
if (mode == INTL_IDN_TO_ASCII) {
+ const int32_t buffer_capac = 255;
+ buffer = zend_string_alloc(buffer_capac, 0);
len = uidna_nameToASCII_UTF8(uts46, ZSTR_VAL(domain), ZSTR_LEN(domain),
ZSTR_VAL(buffer), buffer_capac, &info, &status);
+ if (len >= buffer_capac || php_intl_idn_check_status(status, "failed to convert
name") == FAILURE) {
+ uidna_close(uts46);
+ zend_string_efree(buffer);
+ RETURN_FALSE;
+ }
} else {
+ const int32_t buffer_capac = 252*4;
+ buffer = zend_string_alloc(buffer_capac, 0);
len = uidna_nameToUnicodeUTF8(uts46, ZSTR_VAL(domain), ZSTR_LEN(domain),
ZSTR_VAL(buffer), buffer_capac, &info, &status);
- }
- if (len >= 252*4 || php_intl_idn_check_status(status, "failed to convert name") ==
FAILURE) {
- uidna_close(uts46);
- zend_string_efree(buffer);
- RETURN_FALSE;
+ if (len >= buffer_capac || php_intl_idn_check_status(status, "failed to convert
name") == FAILURE) {
+ uidna_close(uts46);
+ zend_string_efree(buffer);
+ RETURN_FALSE;
+ }
}
ZSTR_VAL(buffer)[len] = '\0';