1 files changed, 113 insertions, 116 deletions

diff --git a/gl/inet_pton.c b/gl/inet_pton.c
index 74d55c43..1e75c8c5 100644
--- a/gl/inet_pton.c
+++ b/gl/inet_pton.c
@@ -1,6 +1,6 @@
 /* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
 
-   Copyright (C) 2006, 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -112,43 +112,44 @@ inet_pton (int af, const char *restrict src, void *restrict dst)
 static int
 inet_pton4 (const char *restrict src, unsigned char *restrict dst)
 {
-  int saw_digit, octets, ch;
-  unsigned char tmp[NS_INADDRSZ], *tp;
+  unsigned char tmp[NS_INADDRSZ];
 
-  saw_digit = 0;
-  octets = 0;
-  *(tp = tmp) = 0;
-  while ((ch = *src++) != '\0')
-    {
-
-      if (ch >= '0' && ch <= '9')
-        {
-          unsigned new = *tp * 10 + (ch - '0');
-
-          if (saw_digit && *tp == 0)
-            return (0);
-          if (new > 255)
-            return (0);
-          *tp = new;
-          if (!saw_digit)
-            {
-              if (++octets > 4)
-                return (0);
-              saw_digit = 1;
-            }
-        }
-      else if (ch == '.' && saw_digit)
-        {
-          if (octets == 4)
-            return (0);
-          *++tp = 0;
-          saw_digit = 0;
-        }
-      else
-        return (0);
-    }
-  if (octets < 4)
-    return (0);
+  {
+    int saw_digit = 0;
+    int octets = 0;
+    unsigned char *tp = tmp;
+    *tp = 0;
+    int ch;
+    while ((ch = *src++) != '\0')
+      {
+        if (ch >= '0' && ch <= '9')
+          {
+            if (saw_digit && *tp == 0)
+              return (0);
+            unsigned new = *tp * 10 + (ch - '0');
+            if (new > 255)
+              return (0);
+            *tp = new;
+            if (!saw_digit)
+              {
+                if (++octets > 4)
+                  return (0);
+                saw_digit = 1;
+              }
+          }
+        else if (ch == '.' && saw_digit)
+          {
+            if (octets == 4)
+              return (0);
+            *++tp = 0;
+            saw_digit = 0;
+          }
+        else
+          return (0);
+      }
+    if (octets < 4)
+      return (0);
+  }
   memcpy (dst, tmp, NS_INADDRSZ);
   return (1);
 }
@@ -172,93 +173,89 @@ static int
 inet_pton6 (const char *restrict src, unsigned char *restrict dst)
 {
   static const char xdigits[] = "0123456789abcdef";
-  unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-  const char *curtok;
-  int ch, saw_xdigit;
-  unsigned val;
+  unsigned char tmp[NS_IN6ADDRSZ];
 
-  tp = memset (tmp, '\0', NS_IN6ADDRSZ);
-  endp = tp + NS_IN6ADDRSZ;
-  colonp = NULL;
   /* Leading :: requires some special handling. */
   if (*src == ':')
     if (*++src != ':')
       return (0);
-  curtok = src;
-  saw_xdigit = 0;
-  val = 0;
-  while ((ch = c_tolower (*src++)) != '\0')
-    {
-      const char *pch;
 
-      pch = strchr (xdigits, ch);
-      if (pch != NULL)
-        {
-          val <<= 4;
-          val |= (pch - xdigits);
-          if (val > 0xffff)
-            return (0);
-          saw_xdigit = 1;
-          continue;
-        }
-      if (ch == ':')
-        {
-          curtok = src;
-          if (!saw_xdigit)
-            {
-              if (colonp)
-                return (0);
-              colonp = tp;
-              continue;
-            }
-          else if (*src == '\0')
-            {
+  {
+    unsigned char *tp = memset (tmp, '\0', NS_IN6ADDRSZ);
+    unsigned char *endp = tp + NS_IN6ADDRSZ;
+    unsigned char *colonp = NULL;
+    const char *curtok = src;
+    int saw_xdigit = 0;
+    unsigned int val = 0;
+    int ch;
+    while ((ch = c_tolower (*src++)) != '\0')
+      {
+        const char *pch = strchr (xdigits, ch);
+        if (pch != NULL)
+          {
+            val <<= 4;
+            val |= (pch - xdigits);
+            if (val > 0xffff)
               return (0);
-            }
-          if (tp + NS_INT16SZ > endp)
-            return (0);
-          *tp++ = (unsigned char) (val >> 8) & 0xff;
-          *tp++ = (unsigned char) val & 0xff;
-          saw_xdigit = 0;
-          val = 0;
-          continue;
-        }
-      if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-          inet_pton4 (curtok, tp) > 0)
-        {
-          tp += NS_INADDRSZ;
-          saw_xdigit = 0;
-          break;                /* '\0' was seen by inet_pton4(). */
-        }
+            saw_xdigit = 1;
+          }
+        else if (ch == ':')
+          {
+            curtok = src;
+            if (!saw_xdigit)
+              {
+                if (colonp)
+                  return (0);
+                colonp = tp;
+              }
+            else if (*src == '\0')
+              return (0);
+            else if (tp + NS_INT16SZ > endp)
+              return (0);
+            else
+              {
+                *tp++ = (unsigned char) (val >> 8) & 0xff;
+                *tp++ = (unsigned char) val & 0xff;
+                saw_xdigit = 0;
+                val = 0;
+              }
+          }
+        else if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
+            inet_pton4 (curtok, tp) > 0)
+          {
+            tp += NS_INADDRSZ;
+            saw_xdigit = 0;
+            break;                /* '\0' was seen by inet_pton4(). */
+          }
+        else
+          return (0);
+      }
+    if (saw_xdigit)
+      {
+        if (tp + NS_INT16SZ > endp)
+          return (0);
+        *tp++ = (unsigned char) (val >> 8) & 0xff;
+        *tp++ = (unsigned char) val & 0xff;
+      }
+    if (colonp != NULL)
+      {
+        if (tp == endp)
+          return (0);
+        /*
+         * Since some memmove()'s erroneously fail to handle
+         * overlapping regions, we'll do the shift by hand.
+         */
+        const int n = tp - colonp;
+        for (int i = 1; i <= n; i++)
+          {
+            endp[-i] = colonp[n - i];
+            colonp[n - i] = 0;
+          }
+        tp = endp;
+      }
+    if (tp != endp)
       return (0);
-    }
-  if (saw_xdigit)
-    {
-      if (tp + NS_INT16SZ > endp)
-        return (0);
-      *tp++ = (unsigned char) (val >> 8) & 0xff;
-      *tp++ = (unsigned char) val & 0xff;
-    }
-  if (colonp != NULL)
-    {
-      /*
-       * Since some memmove()'s erroneously fail to handle
-       * overlapping regions, we'll do the shift by hand.
-       */
-      const int n = tp - colonp;
-      int i;
-
-      if (tp == endp)
-        return (0);
-      for (i = 1; i <= n; i++)
-        {
-          endp[-i] = colonp[n - i];
-          colonp[n - i] = 0;
-        }
-      tp = endp;
-    }
-  if (tp != endp)
-    return (0);
+  }
   memcpy (dst, tmp, NS_IN6ADDRSZ);
   return (1);
 }