Changeset 102932 in vbox

Timestamp:

Jan 17, 2024 4:32:10 PM (14 months ago)

Author:

vboxsync

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

161160

Message:

Guest Properties/HostService: Fixed too strict debug assertions for property name / value length checks, which will happen with old(er) Guest Additions installed. Regression of r150110.

File:

• trunk/include/VBox/HostServices/GuestPropertySvc.h (modified) (2 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -87 +87 @@
 DECLINLINE(int) GuestPropValidateName(const char *pszName, size_t cbName)
 {
-    /* Property name is expected to be at least 1 charecter long plus terminating character. */
-    AssertReturn(cbName >= 2, VERR_INVALID_PARAMETER);
-    AssertReturn(cbName <= GUEST_PROP_MAX_NAME_LEN, VERR_INVALID_PARAMETER);
+    if (   cbName < 2 /* Property name is expected to be at least 1 charecter long plus terminating character. */
+        || cbName > GUEST_PROP_MAX_NAME_LEN)
+        return VERR_INVALID_PARAMETER;
 
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
@@ -118 +118 @@
     /* Zero-length values are possible, however buffer should contain terminating character at least. */
     AssertReturn(cbValue > 0, VERR_INVALID_PARAMETER);
-    AssertReturn(cbValue <= GUEST_PROP_MAX_VALUE_LEN, VERR_TOO_MUCH_DATA);
+
+    if (cbValue > GUEST_PROP_MAX_VALUE_LEN)
+        return VERR_TOO_MUCH_DATA;
 
     return VINF_SUCCESS;