* sysdep.c (str_collate): Clear errno just before wcscoll(_l).

One can't hoist this out of the 'if', because intervening calls to
newlocale, twolower, etc. can change errno.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index 8b62c8c4f62..34fd8b1044b 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3740,8 +3740,6 @@ str_collate (Lisp_Object s1, Lisp_Object s2,
     FETCH_STRING_CHAR_ADVANCE (*(p2+i-1), s2, i, i_byte);
   *(p2+len) = 0;
 
-  errno = 0;
-
   if (STRINGP (locale))
     {
       locale_t loc = newlocale (LC_COLLATE_MASK | LC_CTYPE_MASK,
@@ -3757,6 +3755,7 @@ str_collate (Lisp_Object s1, Lisp_Object s2,
               *p = towlower_l (*p, loc);
           }
 
+      errno = 0;
       res = wcscoll_l (p1, p2, loc);
       err = errno;
       freelocale (loc);
@@ -3771,6 +3770,7 @@ str_collate (Lisp_Object s1, Lisp_Object s2,
               *p = towlower (*p);
           }
 
+      errno = 0;
       res = wcscoll (p1, p2);
       err = errno;
     }