Changeset 94184 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Mar 11, 2022 6:24:17 PM (3 years ago)

Author:

vboxsync

Message:

Main: Guest Properties: notify lesteners that property was deleted (additional fixes in r150441, r150442, r150443, r150445), bugref:10185.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestProp.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestProp.cpp

@@ -937 +937 @@
  * @param   pcbBufActual    If @a pcBuf is not large enough, the size needed.
  *                          Optional.
+ * @param   pfWasDeleted    A flag which indicates that property was deleted.
+ *                          Optional.
  */
 VBGLR3DECL(int) VbglR3GuestPropWait(HGCMCLIENTID idClient,
@@ -944 +946 @@
                                     char ** ppszName, char **ppszValue,
                                     uint64_t *pu64Timestamp, char **ppszFlags,
-                                    uint32_t *pcbBufActual)
+                                    uint32_t *pcbBufActual, bool *pfWasDeleted)
 {
     /*
@@ -973 +975 @@
 
     /*
-     * Buffer layout: Name\0Value\0Flags\0.
+     * Buffer layout: Name\0Value\0Flags\0fWasDeleted\0.
      *
      * If the caller cares about any of these strings, make sure things are
@@ -979 +981 @@
      */
     if (    RT_SUCCESS(rc)
-        &&  (ppszName != NULL || ppszValue != NULL || ppszFlags != NULL))
+        &&  (ppszName != NULL || ppszValue != NULL || ppszFlags != NULL || pfWasDeleted != NULL))
     {
         /* Validate / skip 'Name'. */
@@ -994 +996 @@
 
         if (ppszFlags)
+            *ppszFlags = pszFlags;
+
+        /* Validate / skip 'Flags'. */
+        char *pszWasDeleted = RTStrEnd(pszFlags, cbBuf - (pszFlags - (char *)pvBuf)) + 1;
+        AssertPtrReturn(pszWasDeleted, VERR_TOO_MUCH_DATA);
+        if (pfWasDeleted)
         {
-            /* Validate 'Flags'. */
-            char *pszEos = RTStrEnd(pszFlags, cbBuf - (pszFlags - (char *)pvBuf));
-            AssertPtrReturn(pszEos, VERR_TOO_MUCH_DATA);
-            *ppszFlags = pszFlags;
+            AssertReturn(pszWasDeleted[0] == '0' || pszWasDeleted[0] == '1', VERR_PARSE_ERROR);
+            *pfWasDeleted = pszWasDeleted[0] == '0' ? false : true;
         }
+
+        /* Validate end of buffer string. */
+        char *pszEos = RTStrEnd(pszWasDeleted, cbBuf - (pszWasDeleted - (char *)pvBuf));
+        AssertPtrReturn(pszEos, VERR_TOO_MUCH_DATA);
     }