Changeset 83436 in vbox for trunk

Timestamp:

Mar 26, 2020 1:51:14 PM (5 years ago)

Author:

vboxsync

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

136658

Message:

Guest Control/VBoxServiceToolbox: Use RTListForEachSafe in vgsvcToolboxPathBufDestroy(). bugref:9320

File:

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

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

@@ -292 +292 @@
 static void vgsvcToolboxPathBufDestroy(PRTLISTNODE pList)
 {
-    AssertPtr(pList);
-    /** @todo use RTListForEachSafe */
-    PVBOXSERVICETOOLBOXPATHENTRY pNode = RTListGetFirst(pList, VBOXSERVICETOOLBOXPATHENTRY, Node);
-    while (pNode)
-    {
-        PVBOXSERVICETOOLBOXPATHENTRY pNext = RTListNodeIsLast(pList, &pNode->Node)
-                                           ? NULL
-                                           : RTListNodeGetNext(&pNode->Node, VBOXSERVICETOOLBOXPATHENTRY, Node);
-        RTListNodeRemove(&pNode->Node);
-
-        RTStrFree(pNode->pszName);
-
-        RTMemFree(pNode);
-        pNode = pNext;
+    if (!pList)
+        return;
+
+    PVBOXSERVICETOOLBOXPATHENTRY pEntry, pEntryNext;
+    RTListForEachSafe(pList, pEntry, pEntryNext, VBOXSERVICETOOLBOXPATHENTRY, Node)
+    {
+        RTListNodeRemove(&pEntry->Node);
+
+        RTStrFree(pEntry->pszName);
+        RTMemFree(pEntry);
     }
 }