Changeset 95332 in vbox for trunk/src/VBox/HostServices/GuestProperties

Timestamp:

Jun 21, 2022 7:45:27 PM (3 years ago)

Author:

vboxsync

Message:

GuestProperties: Call setPropertyInternal with different timestamps or we'll assert like crazy in getOldNotification. No need to memcpy the two byte string indication deletion/setting in getNotificationWriteOut. bugref:10185

File:

• trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.cpp

@@ -224 +224 @@
         AssertPtrReturn(pProp, VERR_INVALID_POINTER);
         int rc = getOldNotificationInternal(pszPatterns, nsTimestamp, pProp);
+
 #ifdef VBOX_STRICT
         /*
@@ -1047 +1048 @@
     {
         char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
-        char szWasDeleted[2] = { fWasDeleted ? '1' : '0', '\0' };
-
         rc = GuestPropWriteFlags(rProp.mFlags, szFlags);
         if (RT_SUCCESS(rc))
@@ -1054 +1053 @@
             HGCMSvcSetU64(&paParms[1], rProp.mTimestamp);
 
-            size_t const cbFlags  = strlen(szFlags) + 1;
-            size_t const cbName   = rProp.mName.length() + 1;
-            size_t const cbValue  = rProp.mValue.length() + 1;
-            size_t const cbWasDeleted  = strlen(szWasDeleted) + 1;
-            size_t const cbNeeded = cbName + cbValue + cbFlags + cbWasDeleted;
+            size_t const cbFlags      = strlen(szFlags) + 1;
+            size_t const cbName       = rProp.mName.length() + 1;
+            size_t const cbValue      = rProp.mValue.length() + 1;
+            size_t const cbWasDeleted = 2;
+            size_t const cbNeeded     = cbName + cbValue + cbFlags + cbWasDeleted;
             HGCMSvcSetU32(&paParms[3], (uint32_t)cbNeeded);
             if (cbNeeded <= cbBuf)
@@ -1069 +1068 @@
                 memcpy(pchBuf, szFlags, cbFlags);
                 pchBuf += cbFlags;
-                memcpy(pchBuf, szWasDeleted, cbWasDeleted);
+                *pchBuf++ = fWasDeleted ? '1' : '0';
+                *pchBuf++ = '\0';
             }
             else
@@ -1703 +1703 @@
     AssertRCReturn(rc, rc);
 
-    /* Sysprep execution by VBoxService (host is allowed to change these). */
-    uint64_t nsNow = getCurrentTimestamp();
-    rc = setPropertyInternal("/VirtualBox/HostGuest/SysprepExec", "", GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_RDONLYGUEST, nsNow);
-    AssertRCReturn(rc, rc);
-    rc = setPropertyInternal("/VirtualBox/HostGuest/SysprepArgs", "", GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_RDONLYGUEST, nsNow);
-    AssertRCReturn(rc, rc);
+    uint64_t nsNow = getCurrentTimestamp(); /* Must increment this for each property to avoid asserting in getOldNotification. */
 
     /* Resume and reset counters. */
-    rc = setPropertyInternal("/VirtualBox/VMInfo/ResumeCounter", "0", GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_RDONLYGUEST, nsNow);
-    AssertRCReturn(rc, rc);
     rc = setPropertyInternal("/VirtualBox/VMInfo/ResetCounter",  "0", GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_RDONLYGUEST, nsNow);
     AssertRCReturn(rc, rc);
+    rc = setPropertyInternal("/VirtualBox/VMInfo/ResumeCounter", "0", GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_RDONLYGUEST, ++nsNow);
+    AssertRCReturn(rc, rc);
+
+    /* Sysprep execution by VBoxService (host is allowed to change these). */
+    rc = setPropertyInternal("/VirtualBox/HostGuest/SysprepExec", "", GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_RDONLYGUEST, ++nsNow);
+    AssertRCReturn(rc, rc);
+    rc = setPropertyInternal("/VirtualBox/HostGuest/SysprepArgs", "", GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_RDONLYGUEST, ++nsNow);
+    AssertRCReturn(rc, rc);
+
 
     /* The host notification thread and queue. */