Changeset 11503 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 20, 2008 12:05:27 AM (16 years ago)

Author:

vboxsync

Message:

#1869: Fixed crash in DarwinGetEthernetControllers because of some plainly incorrect assumptions about the order of ethernet controllers.

File:

• trunk/src/VBox/Main/darwin/iokit.cpp (modified) (1 diff)

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -1554 +1554 @@
                                         if (strcmp(pNew->szBSDName, pCur->szBSDName) >= 0)
                                             break;
-                                    Assert(pPrev);
                                 }
-                                pNew->pNext = pPrev->pNext;
-                                pPrev->pNext = pNew;
-                                if (pPrev == pTail)
-                                    pTail = pNew;
+                                if (pPrev)
+                                {
+                                    /* tail or in list. */
+                                    pNew->pNext = pPrev->pNext;
+                                    pPrev->pNext = pNew;
+                                    if (pPrev == pTail)
+                                        pTail = pNew;
+                                }
+                                else
+                                {
+                                    /* head */
+                                    pNew->pNext = pHead;
+                                    pHead = pNew;
+                                }
                             }
                             else
                             {
+                                /* empty list */
                                 pNew->pNext = NULL;
                                 pTail = pHead = pNew;