Changeset 77666 in vbox for trunk

Timestamp:

Mar 12, 2019 3:41:14 PM (6 years ago)

Author:

vboxsync

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

129300

Message:

Main/HostDnsServiceDarwin: Fixed shutting down procedure by making sure fStop is initialized. Also added a couple of checks / assertions.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.cpp (modified) (1 diff)
• darwin/HostDnsServiceDarwin.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/HostDnsService.cpp

@@ -279 +279 @@
 void HostDnsMonitorProxy::uninit()
 {
-    m->monitor->shutdown();
-    delete m;
-    m = NULL;
+    if (m)
+    {
+        m->monitor->shutdown();
+        delete m;
+        m = NULL;
+    }
 }
 

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

@@ -34 +34 @@
 struct HostDnsServiceDarwin::Data
 {
+    Data()
+        : m_fStop(false) { }
+
     SCDynamicStoreRef m_store;
     CFRunLoopSourceRef m_DnsWatcher;
@@ -252 +255 @@
 {
     HostDnsServiceDarwin::Data *pThis = static_cast<HostDnsServiceDarwin::Data *>(info);
+    AssertPtrReturnVoid(pThis);
     pThis->m_fStop = true;
 }