From e2b1bab19a782cb62bb010d1c2925ab7314fb113 Mon Sep 17 00:00:00 2001
diff --git a/absl/base/internal/strerror.cc b/absl/base/internal/strerror.cc
index d66ba120..0d6226fd 100644
--- a/absl/base/internal/strerror.cc
+++ b/absl/base/internal/strerror.cc
@@ -51,7 +51,6 @@ const char* StrErrorAdaptor(int errnum, char* buf, size_t buflen) {
 }
 
 std::string StrErrorInternal(int errnum) {
-  absl::base_internal::ErrnoSaver errno_saver;
   char buf[100];
   const char* str = StrErrorAdaptor(errnum, buf, sizeof buf);
   if (*str == '\0') {
@@ -76,6 +75,7 @@ std::array<std::string, kSysNerr>* NewStrErrorTable() {
 }  // namespace
 
 std::string StrError(int errnum) {
+  absl::base_internal::ErrnoSaver errno_saver;
   static const auto* table = NewStrErrorTable();
   if (errnum >= 0 && errnum < static_cast<int>(table->size())) {
     return (*table)[errnum];
diff --git a/absl/base/internal/strerror_test.cc b/absl/base/internal/strerror_test.cc
index a53da97f..e32d5b5c 100644
--- a/absl/base/internal/strerror_test.cc
+++ b/absl/base/internal/strerror_test.cc
@@ -62,12 +62,14 @@ TEST(StrErrorTest, MultipleThreads) {
       ++counter;
       errno = ERANGE;
       const std::string value = absl::base_internal::StrError(i);
+      // EXPECT_* could change errno. Stash it first.
+      int check_err = errno;
+      EXPECT_THAT(check_err, Eq(ERANGE));
       // Only the GNU implementation is guaranteed to provide the
       // string "Unknown error nnn". POSIX doesn't say anything.
       if (!absl::StartsWith(value, "Unknown error ")) {
-        EXPECT_THAT(absl::base_internal::StrError(i), Eq(expected_strings[i]));
+        EXPECT_THAT(value, Eq(expected_strings[i]));
       }
-      EXPECT_THAT(errno, Eq(ERANGE));
     }
   };
 
alue='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0164655e1dd1a7874845abe3148251799149e36b'>root</a>/<a href='/guix/log/gnu?id=0164655e1dd1a7874845abe3148251799149e36b'>gnu</a>/<a href='/guix/log/gnu/packages?id=0164655e1dd1a7874845abe3148251799149e36b'>packages</a>/<a href='/guix/log/gnu/packages/plan9.scm?id=0164655e1dd1a7874845abe3148251799149e36b'>plan9.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/plan9.scm?id=0164655e1dd1a7874845abe3148251799149e36b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-07-25 10:12:53 +0800'>2024-07-25</span></td><td><a href='/guix/commit/gnu/packages/plan9.scm?id=33d1ec88af75d8c719f01e79501c67c6711b2b93'>gnu: Add drawterm-wayland.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>
<tr><td><span title='2024-07-25 10:12:02 +0800'>2024-07-25</span></td><td><a href='/guix/commit/gnu/packages/plan9.scm?id=eed20f41f06a1abc4f59afd5afbdafe79e3271b5'>gnu: drawterm: Update to 20240703-1.f11139d.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>
<tr><td><span title='2024-01-07 10:39:50 +0800'>2024-01-07</span></td><td><a href='/guix/commit/gnu/packages/plan9.scm?id=25bcf4eda05b501758b11a53823867dc500ac7d1'>plan9port: Update to 0.1.0-1.f8681ac.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>
<tr><td><span title='2024-01-07 10:39:45 +0800'>2024-01-07</span></td><td><a href='/guix/commit/gnu/packages/plan9.scm?id=2538a773c53e0f7fce4de0c49b6ec1d41acc25c0'>plan9port: Install into "$output/plan9" instead of "$output".</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>