generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

call uselocale() before freelocale() to make sure that g_local_key has a valid locale.

Browse Source 
For tests that call uselocale(), the locale is stored in the
g_userlocale_key thread-specific key. If freelocale() is called later,
then g_uselocal_key points to a deleted pointer. CTS eventually calls
vfprintf to print the result, which calls MB_CUR_MAX and MB_CUR_MAX
accesses the deleted locale stored in g_uselocale_key, causing unpredictable
errors.

Fixed the tests by calling uselocale() with the old locale before
calling freelocale.

(cherry-pick of 8a46cf0fcf82b8c76e05be7e066ec854f974603a.)

Bug: 17299565
Change-Id: I87efa2a9b16999a11d587f68d3aeedcbe6ac8a2c
This commit is contained in:
Wally Yau
2014-08-26 09:47:23 -07:00
committed by Elliott Hughes
parent 64ae11ab76
commit a40fdbd565
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/locale_test.cpp
View File

@@ -114,11 +114,12 @@ TEST(locale, mb_cur_max) {
locale_t cloc = newlocale(LC_ALL, "C", 0); locale_t cloc = newlocale(LC_ALL, "C", 0);
locale_t cloc_utf8 = newlocale(LC_ALL, "C.UTF-8", 0); locale_t cloc_utf8 = newlocale(LC_ALL, "C.UTF-8", 0);
uselocale(cloc); locale_t old_locale = uselocale(cloc);
ASSERT_EQ(1U, MB_CUR_MAX); ASSERT_EQ(1U, MB_CUR_MAX);
uselocale(cloc_utf8); uselocale(cloc_utf8);
ASSERT_EQ(4U, MB_CUR_MAX); ASSERT_EQ(4U, MB_CUR_MAX);
uselocale(old_locale);
freelocale(cloc); freelocale(cloc);
freelocale(cloc_utf8); freelocale(cloc_utf8);
} }

3
tests/stdio_test.cpp
View File

@@ -428,7 +428,7 @@ TEST(stdio, snprintf_negative_zero_5084292) {
TEST(stdio, snprintf_utf8_15439554) { TEST(stdio, snprintf_utf8_15439554) {
locale_t cloc = newlocale(LC_ALL, "C.UTF-8", 0); locale_t cloc = newlocale(LC_ALL, "C.UTF-8", 0);
uselocale(cloc); locale_t old_locale = uselocale(cloc);
// http://b/15439554 // http://b/15439554
char buf[BUFSIZ]; char buf[BUFSIZ];
@@ -446,6 +446,7 @@ TEST(stdio, snprintf_utf8_15439554) {
snprintf(buf, sizeof(buf), "%d\xf0\xa4\xad\xa2%d", 1, 2); snprintf(buf, sizeof(buf), "%d\xf0\xa4\xad\xa2%d", 1, 2);
EXPECT_STREQ("1𤭢2", buf); EXPECT_STREQ("1𤭢2", buf);
uselocale(old_locale);
freelocale(cloc); freelocale(cloc);
} }