Changeset 91918 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Oct 21, 2021 1:09:34 AM (3 years ago)

Author:

vboxsync

Message:

IPRT: Make RTNetStrToIPv4Cidr() and RTNetStrToIPv4Cidr() accept zero
prefix, mostly for the benefit of 0.0.0.0/0 and ::/0 respectively.

While here fix RTNetStrToIPv6Cidr to do stricter checks on the prefix.
When the number is too big RTStrToUInt8Ex returns a warning, not an
error. bugref:9330.

File:

• trunk/src/VBox/Runtime/common/net/netaddrstr2.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/net/netaddrstr2.cpp

@@ -291 +291 @@
     }
 
-    if (u8Prefix == 0 || u8Prefix > 32)
+    if (u8Prefix > 32)
         return VERR_INVALID_PARAMETER;
 
@@ -715 +715 @@
     ++pszNext;
     rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &u8Prefix);
-    if (RT_FAILURE(rc) || rc == VWRN_TRAILING_CHARS)
-        return VERR_INVALID_PARAMETER;
-
-    if (u8Prefix == 0 || u8Prefix > 128)
+    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_SPACES)
+        return VERR_INVALID_PARAMETER;
+
+    if (u8Prefix > 128)
         return VERR_INVALID_PARAMETER;