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

Timestamp:

Mar 21, 2018 2:30:29 PM (7 years ago)

Author:

vboxsync

Message:

IPRT/net: RTNetStrToIPv4AddrEx - return VWRN_TRAILING_SPACES and
VWRN_TRAILING_CHARS. Adapt callers. Add more test cases to make sure
trailers are handled as before.

File:

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

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

@@ -72 +72 @@
     if (ppszNext != NULL)
         *ppszNext = pszNext;
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -94 +94 @@
     pcszAddr = RTStrStripL(pcszAddr);
     rc = rtNetStrToIPv4AddrEx(pcszAddr, pAddr, &pszNext);
-    if (rc != VINF_SUCCESS)
-        return VERR_INVALID_PARAMETER;
-
-    pszNext = RTStrStripL(pszNext);
-    if (*pszNext != '\0')
+    if (RT_FAILURE(rc) || rc == VWRN_TRAILING_CHARS)
         return VERR_INVALID_PARAMETER;
 
@@ -138 +134 @@
     pcszAddr = RTStrStripL(pcszAddr);
     rc = rtNetStrToIPv4AddrEx(pcszAddr, &addrIPv4, &pszNext);
-    if (rc != VINF_SUCCESS)
-        return false;
-
-    pszNext = RTStrStripL(pszNext);
-    if (*pszNext != '\0')
+    if (RT_FAILURE(rc) || rc == VWRN_TRAILING_CHARS)
         return false;