Changeset 74772 in vbox

Timestamp:

Oct 11, 2018 1:25:01 PM (6 years ago)

Author:

vboxsync

Message:

Main/iokit.cpp: Don't assert on stupid Belkin USB-C thingy not getting a BSD name.

File:

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

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

@@ -1689 +1689 @@
                         AssertBreak(darwinDictGetData(PropsRef, CFSTR("IOMACAddress"), &Mac, sizeof(Mac)));
 
-                        /* The BSD Name from the interface dictionary. */
+                        /* The BSD Name from the interface dictionary.  No assert here as the belkin USB-C gadget
+                           does not always end up with a BSD name, typically requiring replugging. */
                         char szBSDName[RT_SIZEOFMEMB(DARWINETHERNIC, szBSDName)];
-                        AssertBreak(darwinDictGetString(IfPropsRef, CFSTR("BSD Name"), szBSDName, sizeof(szBSDName)));
+                        if (RT_UNLIKELY(darwinDictGetString(IfPropsRef, CFSTR("BSD Name"), szBSDName, sizeof(szBSDName))))
+                        {
+                            LogRelMax(32, ("DarwinGetEthernetControllers: Warning! Failed to get 'BSD Name'; provider class %s\n", szTmp));
+                            break;
+                        }
 
                         /* Check if it's really wireless. */