Changeset 95325 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Jun 21, 2022 2:18:21 PM (3 years ago)

Author:

vboxsync

Message:

Main/xml: Removed unnecessary string resizing in MachineConfigFile::readGuestProperties, as the string will be freed after the push_back anyway. Added @todo about generating invalid UTF-8. bugref:10185

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4647 +4647 @@
     {
         GuestProperty prop;
-        int rc;
 
         pelmProp->getAttributeValue("name", prop.strName);
@@ -4658 +4657 @@
          * placing it to local cache. */
 
-        rc = GuestPropValidateName(prop.strName.c_str(), (uint32_t)prop.strName.length() + 1  /* '\0' */);
+        int rc = GuestPropValidateName(prop.strName.c_str(), (uint32_t)prop.strName.length() + 1  /* '\0' */);
         if (RT_FAILURE(rc))
         {
@@ -4673 +4672 @@
 
             /* In order to pass validation, guest property value length (including '\0') in bytes
-             * should be less than GUEST_PROP_MAX_VALUE_LEN. Reallocate it to corresponding size. */
-            rc = prop.strValue.reserveNoThrow(GUEST_PROP_MAX_VALUE_LEN - 1);
-            if (RT_SUCCESS(rc))
-            {
-                prop.strValue.mutableRaw()[GUEST_PROP_MAX_VALUE_LEN - 2] = '\0';
-                prop.strValue.jolt();
-            }
-            else
-            {
-                LogRel(("WARNING: Unable to truncate guest property '%s' valuem rc=%Rrc. Guest property value will be skipped.\n",
-                        prop.strName.c_str(), rc));
-                continue;
-            }
+             * should be less than GUEST_PROP_MAX_VALUE_LEN. Chop it down to an appropriate length. */
+            /** @todo r=bird: Should add a RTCString method for this, as this may create a
+             *        invalid UTF-8 encoding if we chop up a UTF-8 sequence. */
+            Assert(prop.strValue.length() + 1 >= GUEST_PROP_MAX_VALUE_LEN);
+            prop.strValue.mutableRaw()[GUEST_PROP_MAX_VALUE_LEN - 2] = '\0';
+            prop.strValue.jolt();
         }
         else if (RT_FAILURE(rc))