diff options
| author | Wally Yau <wyau@google.com> | 2014-08-26 09:47:23 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-08-27 10:26:49 -0700 |
| commit | a40fdbd565785dfaf59c471ff08c14ed0ad35238 (patch) | |
| tree | 20f265b0f09c7ad3c3418cfe24d0fb854140af1d /tests/stdio_test.cpp | |
| parent | 64ae11ab766421fe2c49ebdecb14c36fe0a047fe (diff) | |
call uselocale() before freelocale() to make sure that g_local_key has a valid locale.
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
Diffstat (limited to 'tests/stdio_test.cpp')
| -rw-r--r-- | tests/stdio_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp index 2cd0df25a..c01ab683c 100644 --- a/tests/stdio_test.cpp +++ b/tests/stdio_test.cpp @@ -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); } |