Changeset 76017 in vbox for trunk/src

Timestamp:

Dec 6, 2018 3:05:44 PM (6 years ago)

Author:

vboxsync

Message:

NAT: drvNATDestruct - don't try to stop OS X DNS monitor thread that
hasn't been started. This can happen if slirp refuses to start for
whatever reason, e.g. bad netmask specified in the configuration.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -1501 +1501 @@
 #ifdef RT_OS_DARWIN
     /* Cleanup the DNS watcher. */
-    CFRunLoopRef hRunLoopMain = CFRunLoopGetMain();
-    CFRetain(hRunLoopMain);
-    CFRunLoopRemoveSource(hRunLoopMain, pThis->hRunLoopSrcDnsWatcher, kCFRunLoopCommonModes);
-    CFRelease(hRunLoopMain);
-    CFRelease(pThis->hRunLoopSrcDnsWatcher);
-    pThis->hRunLoopSrcDnsWatcher = NULL;
+    if (pThis->hRunLoopSrcDnsWatcher != NULL)
+    {
+        CFRunLoopRef hRunLoopMain = CFRunLoopGetMain();
+        CFRetain(hRunLoopMain);
+        CFRunLoopRemoveSource(hRunLoopMain, pThis->hRunLoopSrcDnsWatcher, kCFRunLoopCommonModes);
+        CFRelease(hRunLoopMain);
+        CFRelease(pThis->hRunLoopSrcDnsWatcher);
+        pThis->hRunLoopSrcDnsWatcher = NULL;
+    }
 #endif
 }