Changeset 58066 in vbox for trunk

Timestamp:

Oct 6, 2015 6:50:59 PM (9 years ago)

Author:

vboxsync

Message:

RTUriFileCreate: NULL and empty input paths are invalid, period.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/uri.cpp (modified) (2 diffs)
• testcase/tstRTUri.cpp (modified) (2 diffs)

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

@@ -679 +679 @@
 RTDECL(char *) RTUriFileCreate(const char *pszPath)
 {
+    /* Empty paths are invalid. */
+    AssertPtrReturn(pszPath, NULL);
+    AssertReturn(*pszPath, NULL);
+
     char *pszResult = NULL;
     if (pszPath)
@@ -713 +717 @@
             RTStrFree(pszPath1);
         }
-    }
-    else
-    {
-        char *pszResTmp;
-        int cchRes = RTStrAPrintf(&pszResTmp, "file://");
-        if (cchRes)
-            pszResult = pszResTmp;
     }
 

trunk/src/VBox/Runtime/testcase/tstRTUri.cpp

@@ -333 +333 @@
         /* .uFormat          =*/ URI_FILE_FORMAT_UNIX,
         /* .pszCreatedPath   =*/ NULL,
-        /* .pszCreatedUri    =*/ "file://",
+        /* .pszCreatedUri    =*/ NULL,
         /* PathCreateFromUrl =   "" - differs */
         /* UrlCreateFromPath => 0x80070057 (E_INVALIDARG) */
@@ -342 +342 @@
         /* .uFormat          =*/ URI_FILE_FORMAT_WIN,
         /* .pszCreatedPath   =*/ NULL,
-        /* .pszCreatedUri    =*/ "file://",
+        /* .pszCreatedUri    =*/ NULL,
         /* PathCreateFromUrl =   "" - differs */
         /* UrlCreateFromPath => 0x80070057 (E_INVALIDARG) */