Changeset 73804 in vbox

Timestamp:

Aug 21, 2018 4:21:23 PM (6 years ago)

Author:

vboxsync

Message:

Main: bugref:9075: added check into the IMachine::SetExtraData and IVirtualBox::SetExtraData to avoid the presence of non-ASCII and non printable characters in the key

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (4 diffs)
• src-server/MachineImpl.cpp (modified) (2 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2745 +2745 @@
 
         <note>
+          Key must contain only printable ASCII characters.
+        </note>
+        <note>
           Before performing the actual data change, this method will ask all
           registered event listener using the
@@ -2766 +2769 @@
         <result name="E_ACCESSDENIED">
           Modification request refused.
+        </result>
+        <result name="E_INVALIDARG">
+          Key contains invalid characters.
         </result>
 
@@ -6958 +6964 @@
 
         <note>
+          Key must contain only printable ASCII characters.
+        </note>
+        <note>
           Before performing the actual data change, this method will ask all
           registered listeners using the
@@ -6981 +6990 @@
         <result name="VBOX_E_XML_ERROR">
           Could not parse the settings file.
+        </result>
+        <result name="E_INVALIDARG">
+          Key contains invalid characters.
         </result>
 

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

@@ -69 +69 @@
 #include <iprt/sha.h>
 #include <iprt/string.h>
+#include <iprt/ctype.h>
 
 #include <VBox/com/array.h>
@@ -5072 +5073 @@
 HRESULT Machine::setExtraData(const com::Utf8Str &aKey, const com::Utf8Str &aValue)
 {
+    /* Because non-ASCII characters in aKey have caused problems in the settings
+     * they are rejected unless the key should be deleted. */
+    if (!aValue.isEmpty())
+    {
+        for (int i = 0; i < aKey.length(); ++i)
+        {
+            char ch = aKey[i];
+            if (!RTLocCIsPrint(ch))
+                return E_INVALIDARG;
+        }
+    }
+
     Utf8Str strOldValue;            // empty
 

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

@@ -32 +32 @@
 #include <iprt/uuid.h>
 #include <iprt/cpp/xml.h>
+#include <iprt/ctype.h>
 
 #include <VBox/com/com.h>
@@ -2068 +2069 @@
                                  const com::Utf8Str &aValue)
 {
-
     Utf8Str strKey(aKey);
     Utf8Str strValue(aValue);
     Utf8Str strOldValue;            // empty
     HRESULT rc = S_OK;
+
+    /* Because non-ASCII characters in aKey have caused problems in the settings
+     * they are rejected unless the key should be deleted. */
+    if (!strValue.isEmpty())
+    {
+        for (int i = 0; i < strKey.length(); ++i)
+        {
+            char ch = strKey[i];
+            if (!RTLocCIsPrint(ch))
+                return E_INVALIDARG;
+        }
+    }
 
     // locking note: we only hold the read lock briefly to look up the old value,