Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master

1 files changed, 17 insertions, 19 deletions

diff --git a/lib/unistr/u16-cmp.c b/lib/unistr/u16-cmp.c
index 1a27f5d3..8ebe5d22 100644
--- a/lib/unistr/u16-cmp.c
+++ b/lib/unistr/u16-cmp.c
@@ -1,5 +1,5 @@
 /* Compare pieces of UTF-16 strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This file is free software.
@@ -34,29 +34,27 @@ u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n)
   /* Note that the UTF-16 encoding does NOT preserve lexicographic order.
      Namely, if uc1 is a 16-bit character and [uc2a,uc2b] is a surrogate pair,
      we must enforce uc1 < [uc2a,uc2b], even if uc1 > uc2a.  */
-  for (; n > 0;)
+  for (; n > 0; n--)
     {
       uint16_t c1 = *s1++;
       uint16_t c2 = *s2++;
-      if (c1 == c2)
+      if (c1 != c2)
         {
-          n--;
-          continue;
+          if (c1 < 0xd800 || c1 >= 0xe000)
+            {
+              if (!(c2 < 0xd800 || c2 >= 0xe000))
+                /* c2 is a surrogate, but c1 is not.  */
+                return -1;
+            }
+          else
+            {
+              if (c2 < 0xd800 || c2 >= 0xe000)
+                /* c1 is a surrogate, but c2 is not.  */
+                return 1;
+            }
+          return (int)c1 - (int)c2;
+          /* > 0 if c1 > c2, < 0 if c1 < c2. */
         }
-      if (c1 < 0xd800 || c1 >= 0xe000)
-        {
-          if (!(c2 < 0xd800 || c2 >= 0xe000))
-            /* c2 is a surrogate, but c1 is not.  */
-            return -1;
-        }
-      else
-        {
-          if (c2 < 0xd800 || c2 >= 0xe000)
-            /* c1 is a surrogate, but c2 is not.  */
-            return 1;
-        }
-      return (int)c1 - (int)c2;
-      /* > 0 if c1 > c2, < 0 if c1 < c2. */
     }
   return 0;
 }