diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-06-04 01:06:01 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-18 16:26:05 -0700 |
| commit | 8ab4e2e90de44db0ee56b53e956b2b23f3c1cfa8 (patch) | |
| tree | 9664bf57efb52f95ff87fad22a3488044b263479 | |
| parent | b512adf78d2a1b5fc16cec7dc767b2e5c8f0297e (diff) | |
| download | php-git-8ab4e2e90de44db0ee56b53e956b2b23f3c1cfa8.tar.gz | |
Fix bug #67349: Locale::parseLocale Double Free
| -rw-r--r-- | ext/intl/locale/locale_methods.c | 7 | ||||
| -rw-r--r-- | ext/intl/tests/locale_parse_locale2.phpt | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index 1707c69f93..0afbba2a51 100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -269,8 +269,7 @@ static char* get_icu_value_internal( char* loc_name , char* tag_name, int* resul grOffset = findOffset( LOC_GRANDFATHERED , loc_name ); if( grOffset >= 0 ){ if( strcmp(tag_name , LOC_LANG_TAG)==0 ){ - tag_value = estrdup(loc_name); - return tag_value; + return estrdup(loc_name); } else { /* Since Grandfathered , no value , do nothing , retutn NULL */ return NULL; @@ -280,8 +279,8 @@ static char* get_icu_value_internal( char* loc_name , char* tag_name, int* resul if( fromParseLocale==1 ){ /* Handle singletons */ if( strcmp(tag_name , LOC_LANG_TAG)==0 ){ - if( strlen(loc_name)>1 && (isIDPrefix(loc_name) ==1 ) ){ - return loc_name; + if( strlen(loc_name)>1 && isIDPrefix(loc_name) ){ + return estrdup(loc_name); } } diff --git a/ext/intl/tests/locale_parse_locale2.phpt b/ext/intl/tests/locale_parse_locale2.phpt index 6012862a48..30cc8cc0ae 100644 --- a/ext/intl/tests/locale_parse_locale2.phpt +++ b/ext/intl/tests/locale_parse_locale2.phpt @@ -63,7 +63,8 @@ function ut_main() //Some Invalid Tags: 'de-419-DE', 'a-DE', - 'ar-a-aaa-b-bbb-a-ccc' + 'ar-a-aaa-b-bbb-a-ccc', + 'x-AAAAAA', ); @@ -201,3 +202,6 @@ No values found from Locale parsing. --------------------- ar-a-aaa-b-bbb-a-ccc: language : 'ar' , +--------------------- +x-AAAAAA: +private0 : 'AAAAAA' , |