Changeset 64962 in vbox

Timestamp:

Dec 19, 2016 2:57:15 PM (8 years ago)

Author:

vboxsync

Message:

Main/VirtualBox: check VM name, must not be empty, plus sanity check for sanitiseMachineFilename()

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1323 +1323 @@
                                            com::Utf8Str       &aFile)
 {
-    LogFlowThisFuncEnter();
+    if (RT_UNLIKELY(aName.isEmpty()))
+        return setError(E_INVALIDARG, tr("Machine name is invalid, must not be empty"));
 
     Utf8Str strBase = aBaseFolder;
@@ -1345 +1346 @@
                 fDirectoryIncludesUUID = (strValue == "1");
 
-        } while(uPos != com::Utf8Str::npos);
+        } while (uPos != com::Utf8Str::npos);
     }
 
@@ -1429 +1430 @@
     };
 
-    char *pszName = strName.mutableRaw();
-    ssize_t cReplacements = RTStrPurgeComplementSet(pszName, s_uszValidRangePairs, '_');
-    Assert(cReplacements >= 0);
-    NOREF(cReplacements);
-
-    /* No leading dot or dash. */
-    if (pszName[0] == '.' || pszName[0] == '-')
-        pszName[0] = '_';
-
-    /* No trailing dot. */
-    if (pszName[strName.length() - 1] == '.')
-        pszName[strName.length() - 1] = '_';
-
-    /* Mangle leading and trailing spaces. */
-    for (size_t i = 0; pszName[i] == ' '; ++i)
-        pszName[i] = '_';
-    for (size_t i = strName.length() - 1; i && pszName[i] == ' '; --i)
-        pszName[i] = '_';
+    if (!strName.isEmpty())
+    {
+        char *pszName = strName.mutableRaw();
+        ssize_t cReplacements = RTStrPurgeComplementSet(pszName, s_uszValidRangePairs, '_');
+        Assert(cReplacements >= 0);
+        NOREF(cReplacements);
+
+        /* No leading dot or dash. */
+        if (pszName[0] == '.' || pszName[0] == '-')
+            pszName[0] = '_';
+
+        /* No trailing dot. */
+        if (pszName[strName.length() - 1] == '.')
+            pszName[strName.length() - 1] = '_';
+
+        /* Mangle leading and trailing spaces. */
+        for (size_t i = 0; pszName[i] == ' '; ++i)
+            pszName[i] = '_';
+        for (size_t i = strName.length() - 1; i && pszName[i] == ' '; --i)
+            pszName[i] = '_';
+    }
 }