Changeset 64955 in vbox

Timestamp:

Dec 19, 2016 9:30:34 AM (8 years ago)

Author:

vboxsync

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

112372

Message:

Main: better fix

File:

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

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

@@ -1406 +1406 @@
 void sanitiseMachineFilename(Utf8Str &strName)
 {
+    if (strName.isEmpty())
+        return;
+
     /* Set of characters which should be safe for use in filenames: some basic
      * ASCII, Unicode from Latin-1 alphabetic to the end of Hangul.  We try to
@@ -1426 +1429 @@
     };
 
-    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] = '_';
-    }
+    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] = '_';
 }