Changeset 58049 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Oct 6, 2015 1:06:34 PM (9 years ago)

Author:

vboxsync

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

103103

Message:

uri.cpp: r=bird: You need to decode the stuff, you cannot just copy raw URI bytes.

File:

• trunk/src/VBox/Runtime/common/misc/uri.cpp (modified) (2 diffs)

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

@@ -122 +122 @@
 {
     AssertPtrReturn(pszString, NULL);
-    AssertReturn(strlen(pszString) >= cchString, NULL);
+    AssertReturn(memchr(pszString, '\0', cchString) == NULL, NULL);
 
     /*
@@ -797 +797 @@
          */
         char *pszResult;
-
-        do
-        {
-            char *pszTmp = pszResult = RTStrAlloc(cbResult);
-            if (pszTmp)
+        char *pszTmp = pszResult = RTStrAlloc(cbResult);
+        if (pszTmp)
+        {
+            size_t cbTmp = cbResult;
+            if (uFormat == URI_FILE_FORMAT_WIN)
             {
-                size_t cbTmp = cbResult;
-
-                if (uFormat == URI_FILE_FORMAT_WIN)
+                /* If an authority is given, add the required UNC prefix. */
+                if (Parsed.cchAuthority)
                 {
-                    /* If an authority is given, add the required UNC prefix. */
-                    if (Parsed.cchAuthority)
-                    {
-                        rc = RTStrCatP(&pszTmp, &cbTmp, "\\\\");
-                        if (RT_SUCCESS(rc))
-                            rc = RTStrCatPEx(&pszTmp, &cbTmp, &pszUri[Parsed.offAuthority], Parsed.cchAuthority);
-                    }
+                    rc = RTStrCatP(&pszTmp, &cbTmp, "\\\\");
+                    if (RT_SUCCESS(rc))
+/** @todo r=bird: YOU MUST DECODE THE STRING!!  */
+                        rc = RTStrCatPEx(&pszTmp, &cbTmp, &pszUri[Parsed.offAuthority], Parsed.cchAuthority);
                 }
-
-                if (RT_SUCCESS(rc))
-                    rc = RTStrCatPEx(&pszTmp, &cbTmp, &pszUri[Parsed.offPath], Parsed.cchPath);
-
-                if (RT_FAILURE(rc))
-                    RTStrFree(pszResult);
             }
-            else
-                rc = VERR_NO_MEMORY;
-
-        } while (0);
-
+
+/** @todo r=bird: YOU MUST DECODE THE STRING!!  */
+            if (RT_SUCCESS(rc))
+                rc = RTStrCatPEx(&pszTmp, &cbTmp, &pszUri[Parsed.offPath], Parsed.cchPath);
+
+            if (RT_FAILURE(rc))
+                RTStrFree(pszResult);
+        }
+        else
+            rc = VERR_NO_MEMORY;
         if (RT_SUCCESS(rc))
         {