Changeset 31933 in vbox for trunk

Timestamp:

Aug 24, 2010 3:59:54 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService/PropCache: Fixed deadlock in error case.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp

@@ -303 +303 @@
         va_end(va);
         if (!pszPath)
-            return VERR_NO_STR_MEMORY;
-
-        /* Iterate through all nodes and compare their paths. */
-        RTListForEach(&pCache->NodeHead, pNodeIt, VBOXSERVICEVEPROPCACHEENTRY, NodeSucc)
-        {
-            if (RTStrStr(pNodeIt->pszName, pszPath) == pNodeIt->pszName)
-            {
-                /** @todo Use some internal function to update the node directly, this is slow atm. */
-                rc = VBoxServicePropCacheUpdate(pCache, pNodeIt->pszName, pszValue);
-            }
-            if (RT_FAILURE(rc))
-                break;
-        }
-        RTStrFree(pszPath);
+        {
+            rc = VERR_NO_STR_MEMORY;
+        }
+        else
+        {
+            /* Iterate through all nodes and compare their paths. */
+            RTListForEach(&pCache->NodeHead, pNodeIt, VBOXSERVICEVEPROPCACHEENTRY, NodeSucc)
+            {
+                if (RTStrStr(pNodeIt->pszName, pszPath) == pNodeIt->pszName)
+                {
+                    /** @todo Use some internal function to update the node directly, this is slow atm. */
+                    rc = VBoxServicePropCacheUpdate(pCache, pNodeIt->pszName, pszValue);
+                }
+                if (RT_FAILURE(rc))
+                    break;
+            }
+            RTStrFree(pszPath);
+        }
         RTCritSectLeave(&pCache->CritSect);
     }