Changeset 99214 in vbox for trunk/src/VBox

Timestamp:

Mar 29, 2023 8:28:22 PM (22 months ago)

Author:

vboxsync

Message:

VBoxHeadless: Simplified code around SetVRDEProperty.

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -960 +960 @@
     const char *vrdeEnabled = NULL;
     unsigned cVRDEProperties = 0;
-    const char *aVRDEProperties[16];
+    const char *apszVRDEProperties[16];
     unsigned fPaused = 0;
 #ifdef VBOX_WITH_RECORDING
@@ -1055 +1055 @@
                 break;
             case 'e':
-                if (cVRDEProperties < RT_ELEMENTS(aVRDEProperties))
-                    aVRDEProperties[cVRDEProperties++] = ValueUnion.psz;
+                if (cVRDEProperties < RT_ELEMENTS(apszVRDEProperties))
+                    apszVRDEProperties[cVRDEProperties++] = ValueUnion.psz;
                 else
                      RTPrintf("Warning: too many VRDE properties. Ignored: '%s'\n", ValueUnion.psz);
@@ -1397 +1397 @@
                 for (unsigned i = 0; i < cVRDEProperties; i++)
                 {
-                    /* Parse 'name=value' */
-                    char *pszProperty = RTStrDup(aVRDEProperties[i]);
-                    if (pszProperty)
+                    /* Split 'name=value' and feed the parts to SetVRDEProperty. */
+                    const char *pszDelimiter = strchr(apszVRDEProperties[i], '=');
+                    if (pszDelimiter)
                     {
-                        char *pDelimiter = strchr(pszProperty, '=');
-                        if (pDelimiter)
-                        {
-                            *pDelimiter = '\0';
-
-                            Bstr bstrName = pszProperty;
-                            Bstr bstrValue = &pDelimiter[1];
-                            CHECK_ERROR_BREAK(vrdeServer, SetVRDEProperty(bstrName.raw(), bstrValue.raw()));
-                        }
-                        else
-                        {
-                            RTPrintf("Error: Invalid VRDE property '%s'\n", aVRDEProperties[i]);
-                            RTStrFree(pszProperty);
-                            hrc = E_INVALIDARG;
-                            break;
-                        }
-                        RTStrFree(pszProperty);
+                        Bstr bstrName(apszVRDEProperties[i], pszDelimiter - apszVRDEProperties[i]);
+                        Bstr bstrValue(pszDelimiter + 1);
+                        CHECK_ERROR_BREAK(vrdeServer, SetVRDEProperty(bstrName.raw(), bstrValue.raw()));
                     }
                     else
                     {
-                        RTPrintf("Error: Failed to allocate memory for VRDE property '%s'\n", aVRDEProperties[i]);
-                        hrc = E_OUTOFMEMORY;
+                        RTPrintf("Error: Invalid VRDE property '%s'\n", apszVRDEProperties[i]);
+                        hrc = E_INVALIDARG;
                         break;
                     }