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

Timestamp:

Oct 9, 2023 6:36:29 PM (19 months ago)

Author:

vboxsync

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

159422

Message:

Host services: VBoxGuestPropSvc: Improved checks when guest is subscribed to multiple properties notifications, bugref:10185.

File:

• trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.cpp (modified) (1 diff)

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

@@ -1265 +1265 @@
      * to the queue for guest notifications */
     CallList::iterator it = mGuestWaiters.begin();
-    if (it != mGuestWaiters.end())
+    while (it != mGuestWaiters.end())
     {
         const char *pszPatterns = NULL;
         uint32_t    cchPatterns;
-        HGCMSvcGetCStr(&it->mParms[0], &pszPatterns, &cchPatterns);
-
-        while (it != mGuestWaiters.end())
-        {
-            if (prop.Matches(pszPatterns))
-            {
-                int rc2 = getNotificationWriteOut(it->mParmsCnt, it->mParms, prop, !pProp);
-                if (RT_SUCCESS(rc2))
-                    rc2 = it->mRc;
-                mpHelpers->pfnCallComplete(it->mHandle, rc2);
-                it = mGuestWaiters.erase(it);
-            }
-            else
-                ++it;
-        }
+        int rc2;
+
+        rc2 = HGCMSvcGetCStr(&it->mParms[0], &pszPatterns, &cchPatterns);
+        if (RT_FAILURE(rc2))
+        {
+            LogRel(("doNotifications: failed to get match pattern for guest property notification request, rc=%Rrc\n", rc2));
+            mpHelpers->pfnCallComplete(it->mHandle, VERR_INVALID_PARAMETER);
+            it = mGuestWaiters.erase(it);
+        }
+        else if (prop.Matches(pszPatterns))
+        {
+            rc2 = getNotificationWriteOut(it->mParmsCnt, it->mParms, prop, !pProp);
+            if (RT_SUCCESS(rc2))
+                rc2 = it->mRc;
+            mpHelpers->pfnCallComplete(it->mHandle, rc2);
+            it = mGuestWaiters.erase(it);
+        }
+        else
+            ++it;
     }