Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / inet / inet_net.c

diff --git a/inet/inet_net.c b/inet/inet_net.c
index cfaadd7949674fda841311dfb4d5beccb24d5dee..d891ba2be0ff9b2ad0b525492980e8dc833b0ebc 100644 (file)
--- a/inet/inet_net.c
+++ b/inet/inet_net.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -31,9 +27,22 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_network.c     8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* Copyright (C) 2013-2019 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -45,46 +54,53 @@ static char sccsid[] = "@(#)inet_network.c  8.1 (Berkeley) 6/4/93";
  * The library routines call this routine to interpret
  * network numbers.
  */
-u_int32_t
-inet_network(cp)
-       register const char *cp;
+uint32_t
+inet_network (const char *cp)
 {
-       register u_int32_t val, base, n;
-       register char c;
-       u_int32_t parts[4], *pp = parts;
-       register int i;
+       uint32_t val, base, n, i;
+       char c;
+       uint32_t parts[4], *pp = parts;
+       int digit;
 
 again:
-       val = 0; base = 10;
+       val = 0; base = 10; digit = 0;
        if (*cp == '0')
-               base = 8, cp++;
+               digit = 1, base = 8, cp++;
        if (*cp == 'x' || *cp == 'X')
-               base = 16, cp++;
-       while (c = *cp) {
+               digit = 0, base = 16, cp++;
+       while ((c = *cp) != 0) {
                if (isdigit(c)) {
+                       if (base == 8 && (c == '8' || c == '9'))
+                               return (INADDR_NONE);
                        val = (val * base) + (c - '0');
                        cp++;
+                       digit = 1;
                        continue;
                }
                if (base == 16 && isxdigit(c)) {
-                       val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
+                       val = (val << 4) + (tolower (c) + 10 - 'a');
                        cp++;
+                       digit = 1;
                        continue;
                }
                break;
        }
+       if (!digit)
+               return (INADDR_NONE);
+       if (pp >= parts + 4 || val > 0xff)
+               return (INADDR_NONE);
        if (*cp == '.') {
-               if (pp >= parts + 4)
-                       return (INADDR_NONE);
                *pp++ = val, cp++;
                goto again;
        }
-       if (*cp && !isspace(*cp))
+       while (isspace(*cp))
+               cp++;
+       if (*cp)
+               return (INADDR_NONE);
+       if (pp >= parts + 4 || val > 0xff)
                return (INADDR_NONE);
        *pp++ = val;
        n = pp - parts;
-       if (n > 4)
-               return (INADDR_NONE);
        for (val = 0, i = 0; i < n; i++) {
                val <<= 8;
                val |= parts[i] & 0xff;