com php-src: Fix bug #67397 (Buffer overflow in locale_get_ display_name->uloc_getDisplayName (libicu 4.8 .1)): NEWS ext/intl/locale/locale_methods.c
ext/intl/tests/bug67397.phpt
| From: | Stanislav Malyshev | Date: | Sun, 22 Jun 2014 01:44:14 +0000 |
| Subject: | com php-src: Fix bug #67397 (Buffer overflow in locale_get_ display_name->uloc_getDisplayName (libicu 4.8 .1)): NEWS ext/intl/locale/locale_methods.c ext/intl/tests/bug67397.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79042@lists.php.net to get a copy of this message | ||
Commit: 6027c56fd727d2c4b193b96fee19cdbb4a128447
Author: Stanislav Malyshev <stas@php.net> Sun, 8 Jun 2014 13:44:40 -0700
Parents: aef6432fbe9cd9b75e29acda226c34d57e434dec
Branches: PHP-5.4 PHP-5.4.30 PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6027c56fd727d2c4b193b96fee19cdbb4a128447
Log:
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Bugs:
https://bugs.php.net/67397
Changed paths:
M NEWS
M ext/intl/locale/locale_methods.c
A ext/intl/tests/bug67397.phpt
Diff:
diff --git a/NEWS b/NEWS
index 37dcc63..507b545 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,8 @@ PHP NEWS
- Intl:
. Fixed bug #67349 (Locale::parseLocale Double Free). (Stas)
+ . Fixed bug #67397 (Buffer overflow in locale_get_display_name and
+ uloc_getDisplayName (libicu 4.8.1)). (Stas)
- Network:
. Fixed bug #67432 (Fix potential segfault in dns_get_record()).
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index f6b3142..3bb5648 100644
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -500,8 +500,16 @@ static void get_icu_disp_value_src_php( char* tag_name,
INTERNAL_FUNCTION_PARAME
RETURN_FALSE;
}
+ if(loc_name_len > ULOC_FULLNAME_CAPACITY) {
+ /* See bug 67397: overlong locale names cause trouble in uloc_getDisplayName */
+ spprintf(&msg , 0, "locale_get_display_%s : name too long", tag_name );
+ intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, msg , 1 TSRMLS_CC );
+ efree(msg);
+ RETURN_FALSE;
+ }
+
if(loc_name_len == 0) {
- loc_name = INTL_G(default_locale);
+ loc_name = INTL_G(default_locale);
}
if( strcmp(tag_name, DISP_NAME) != 0 ){
diff --git a/ext/intl/tests/bug67397.phpt b/ext/intl/tests/bug67397.phpt
new file mode 100644
index 0000000..b2b2911
--- /dev/null
+++ b/ext/intl/tests/bug67397.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
+--SKIPIF--
+<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+--FILE--
+<?php
+
+function ut_main()
+{
+ $ret = var_export(ut_loc_get_display_name(str_repeat('*', 256), 'en_us'),
true);
+ $ret .= "\n";
+ $ret .= var_export(intl_get_error_message(), true);
+ return $ret;
+}
+
+include_once( 'ut_common.inc' );
+ut_run();
+?>
+--EXPECTF--
+false
+'locale_get_display_name : name too long: U_ILLEGAL_ARGUMENT_ERROR'