Changeset 74424 in vbox

Timestamp:

Sep 22, 2018 8:00:36 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

125259

Message:

IPRT/uri: Better handling of empty port specifiers. bugref:9249

Location:

trunk

Files:

• include/iprt/uri.h (modified) (2 diffs)
• src/VBox/Runtime/common/misc/uri.cpp (modified) (3 diffs)

trunk/include/iprt/uri.h

@@ -97 +97 @@
     /** The length of the host part of the authority. */
     size_t      cchAuthorityHost;
-    /** The authority port number, UINT32_MAX if not present. */
+    /** The authority port number, UINT32_MAX if not present or empty. */
     uint32_t    uAuthorityPort;
     /** @} */
@@ -110 +110 @@
 /** Set if the URI contains escaped characters. */
 #define RTURIPARSED_F_CONTAINS_ESCAPED_CHARS        UINT32_C(0x00000001)
-/** Set if the URI have an authority component.  Necessary since the authority
+/** Set if the URI has an authority component.  Necessary since the authority
  * component can have a zero length. */
-#define RTURIPARSED_F_HAVE_AUTHORITY                UINT32_C(0x00000002)
+#define RTURIPARSED_F_HAS_AUTHORITY                 UINT32_C(0x00000002)
+/** Set if there is a port component. */
+#define RTURIPARSED_F_HAS_PORT                      UINT32_C(0x00000004)
 /** @} */
 

trunk/src/VBox/Runtime/common/misc/uri.cpp

@@ -445 +445 @@
         off += 2;
         pParsed->offAuthority = pParsed->offAuthorityUsername = pParsed->offAuthorityPassword = pParsed->offAuthorityHost = off;
-        pParsed->fFlags |= RTURIPARSED_F_HAVE_AUTHORITY;
+        pParsed->fFlags |= RTURIPARSED_F_HAS_AUTHORITY;
 
         /*
@@ -496 +496 @@
                 size_t cchTmp = &pszUri[pParsed->offAuthorityHost + pParsed->cchAuthorityHost] - &pszColon[1];
                 pParsed->cchAuthorityHost -= cchTmp + 1;
-
-                pParsed->uAuthorityPort = 0;
-                while (cchTmp-- > 0)
+                pParsed->fFlags |= RTURIPARSED_F_HAS_PORT;
+                if (cchTmp > 0)
                 {
-                    ch = *++pszColon;
-                    if (   RT_C_IS_DIGIT(ch)
-                        && pParsed->uAuthorityPort < UINT32_MAX / UINT32_C(10))
+                    pParsed->uAuthorityPort = 0;
+                    while (cchTmp-- > 0)
                     {
-                        pParsed->uAuthorityPort *= 10;
-                        pParsed->uAuthorityPort += ch - '0';
+                        ch = *++pszColon;
+                        if (   RT_C_IS_DIGIT(ch)
+                            && pParsed->uAuthorityPort < UINT32_MAX / UINT32_C(10))
+                        {
+                            pParsed->uAuthorityPort *= 10;
+                            pParsed->uAuthorityPort += ch - '0';
+                        }
+                        else
+                            return VERR_URI_INVALID_PORT_NUMBER;
                     }
-                    else
-                        return VERR_URI_INVALID_PORT_NUMBER;
                 }
             }
@@ -678 +681 @@
     AssertPtrReturn(pParsed, NULL);
     AssertReturn(pParsed->u32Magic == RTURIPARSED_MAGIC, NULL);
-    if (pParsed->cchAuthority || (pParsed->fFlags & RTURIPARSED_F_HAVE_AUTHORITY))
+    if (pParsed->cchAuthority || (pParsed->fFlags & RTURIPARSED_F_HAS_AUTHORITY))
         return rtUriPercentDecodeN(&pszUri[pParsed->offAuthority], pParsed->cchAuthority);
     return NULL;