commit 598d25bf78fa632e70cb80d4033572328f5bd1b7
author Christopher Ferris <cferris@google.com> Wed Aug 27 22:42:11 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 27 22:42:11 2014 +0000
tree b42482dd25138cd4728f86a2e7f7e28d63591087
parent 6cc4e3b6ce726fb7aab6eff1ca8f4a28f9f21ee9
parent 172955a4e30b88ce8239a7ef426b4e8903e9923c

Merge "Replace snprintf calls in linker." into lmp-dev

tests/locale_test.cpp

diff --git a/tests/locale_test.cpp b/tests/locale_test.cpp
index 325f6ce..7ec607a 100644
--- a/tests/locale_test.cpp
+++ b/tests/locale_test.cpp
@@ -114,11 +114,12 @@
   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);
 }

tests/stdio_test.cpp

diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp
index bb86509..8c8c235 100644
--- a/tests/stdio_test.cpp
+++ b/tests/stdio_test.cpp
@@ -428,7 +428,7 @@
 
 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 @@
   snprintf(buf, sizeof(buf), "%d\xf0\xa4\xad\xa2%d", 1, 2);
   EXPECT_STREQ("1𤭢2", buf);
 
+  uselocale(old_locale);
   freelocale(cloc);
 }