tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "call uselocale() before freelocale() to make sure that g_local_key has a valid locale." into lmp-dev

Browse source
This commit is contained in:
Elliott Hughes 2014-08-27 17:25:23 +00:00 committed by Android (Google) Code Review
commit 6cc4e3b6ce
2 changed files with 4 additions and 2 deletions
Show stats 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_utf8 = newlocale(LC_ALL, "C.UTF-8", 0);
uselocale(cloc);
locale_t old_locale = uselocale(cloc);
ASSERT_EQ(1U, MB_CUR_MAX);
uselocale(cloc_utf8);
ASSERT_EQ(4U, MB_CUR_MAX);
uselocale(old_locale);
freelocale(cloc);
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) {
locale_t cloc = newlocale(LC_ALL, "C.UTF-8", 0);
uselocale(cloc);
locale_t old_locale = uselocale(cloc);
// http://b/15439554
char buf[BUFSIZ];
@ -446,6 +446,7 @@ TEST(stdio, snprintf_utf8_15439554) {
snprintf(buf, sizeof(buf), "%d\xf0\xa4\xad\xa2%d", 1, 2);
EXPECT_STREQ("1𤭢2", buf);
uselocale(old_locale);
freelocale(cloc);
}