Kext: Check fSharedMemory and fDataQueue before trying to release the…

…m in terminate()
google · Apr 9, 2015 · cbb786c · cbb786c
1 parent 49b169e
commit cbb786c
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/Source/santa-driver/SantaDriverClient.cc b/Source/santa-driver/SantaDriverClient.cc
@@ -43,12 +43,13 @@ bool SantaDriverClient::start(IOService *provider) {
 
   fSDM = fProvider->GetDecisionManager();
 
+  if (!fSDM) return false;
+
   return true;
 }
 
 void SantaDriverClient::stop(IOService *provider) {
   super::stop(provider);
-
   fProvider = NULL;
 }
 
@@ -61,11 +62,15 @@ bool SantaDriverClient::terminate(IOOptionBits options) {
   fSDM->DisconnectClient();
   LOGI("Client disconnected.");
 
-  fSharedMemory->release();
-  fSharedMemory = NULL;
+  if (fSharedMemory) {
+    fSharedMemory->release();
+    fSharedMemory = NULL;
+  }
 
-  fDataQueue->release();
-  fDataQueue = NULL;
+  if (fDataQueue) {
+    fDataQueue->release();
+    fDataQueue = NULL;
+  }
 
   if (fProvider && fProvider->isOpen(this)) fProvider->close(this);