src-server

Timestamp:

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

Author:

vboxsync

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

112369

Message:

forward-ported r112367 (Main: santiy check for sanitiseMachineFilename())

Location:

trunk

Files:

: 3 edited

. (modified) (1 prop)
src/VBox (modified) (1 prop)
src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk

Property svn:mergeinfo

old	new
7	7	/branches/VBox-4.3/trunk:91223
8	8	/branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
	9	/branches/VBox-5.1:112367
9	10	/branches/andy/draganddrop:90781-91268
10	11	/branches/andy/guestctrl20:78916,78930

trunk/src/VBox

Property svn:mergeinfo

old	new
7	7	/branches/VBox-4.3/trunk/src/VBox:91223
8	8	/branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
	9	/branches/VBox-5.1/src/VBox:112367
9	10	/branches/andy/draganddrop/src/VBox:90781-91268
10	11	/branches/andy/guestctrl20/src/VBox:78916,78930

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

-              r63585
+              r64954
     };
+    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] = '_';
+    }
+}

Note: See TracChangeset for help on using the changeset viewer.

Changeset 64954 in vbox for trunk/src/VBox/Main/src-server

Legend:

trunk

trunk/src/VBox

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

Download in other formats: