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

Timestamp:

Jun 21, 2022 10:33:35 PM (3 years ago)

Author:

vboxsync

Message:

GuestPropertySvc.h,Main: Changed GuestPropValidateName and GuestPropValidateValue to take size_t instead of uint32_t, eliminating the need for a bunch of (uint32_t) casts. Call setErrorBoth when either of the two fails in Main. [build fix] bugref:10185

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -6012 +6012 @@
 
     int vrc = GuestPropValidateName(aProperty.c_str(), aProperty.length() + 1 /* '\0' */);
-    AssertRCReturn(rc, setErrorBoth(E_INVALIDARG, vrc));
+    AssertRCReturn(vrc, setErrorBoth(E_INVALIDARG, vrc));
 
     vrc = GuestPropValidateValue(aValue.c_str(), aValue.length() + 1  /* '\0' */);
-    AssertRCReturn(rc, setErrorBoth(E_INVALIDARG, vrc));
+    AssertRCReturn(vrc, setErrorBoth(E_INVALIDARG, vrc));
 
     HRESULT rc = i_setGuestPropertyToVM(aProperty, aValue, aFlags, /* fDelete = */ false);