YogaSMC: Fix warning from Clang analyzer

zhen-zen · Sep 3, 2020 · c5ced60 · c5ced60
1 parent b36aabd
commit c5ced60
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/YogaSMC/YogaSMC.cpp b/YogaSMC/YogaSMC.cpp
@@ -218,7 +218,9 @@ bool YogaSMC::notificationHandler(void *refCon, IOService *newService, IONotifie
 YogaSMC* YogaSMC::withDevice(IOService *provider, IOACPIPlatformDevice *device) {
     YogaSMC* dev = OSTypeAlloc(YogaSMC);
 
-    OSDictionary* dictionary = OSDictionary::withCapacity(1);
+    OSDictionary *dictionary = OSDictionary::withCapacity(1);
+    OSDictionary *sensors = OSDictionary::withDictionary(OSDynamicCast(OSDictionary, provider->getProperty("Sensors")));
+    dictionary->setObject("Sensors", sensors);
 
     dev->ec = device;
 
@@ -227,7 +229,8 @@ YogaSMC* YogaSMC::withDevice(IOService *provider, IOACPIPlatformDevice *device)
         OSSafeReleaseNULL(dev);
     }
 
-    dev->conf = OSDynamicCast(OSDictionary, provider->getProperty("Sensors"));
+    dev->conf = sensors;
+    sensors->release();
     dictionary->release();
     return dev;
 }

diff --git a/YogaSMC/YogaSMC/IdeaSMC.cpp b/YogaSMC/YogaSMC/IdeaSMC.cpp
@@ -13,7 +13,9 @@ OSDefineMetaClassAndStructors(IdeaSMC, YogaSMC);
 IdeaSMC* IdeaSMC::withDevice(IOService *provider, IOACPIPlatformDevice *device) {
     IdeaSMC* dev = OSTypeAlloc(IdeaSMC);
 
-    OSDictionary* dictionary = OSDictionary::withCapacity(1);
+    OSDictionary *dictionary = OSDictionary::withCapacity(1);
+    OSDictionary *sensors = OSDictionary::withDictionary(OSDynamicCast(OSDictionary, provider->getProperty("Sensors")));
+    dictionary->setObject("Sensors", sensors);
 
     dev->ec = device;
 
@@ -22,7 +24,8 @@ IdeaSMC* IdeaSMC::withDevice(IOService *provider, IOACPIPlatformDevice *device)
         OSSafeReleaseNULL(dev);
     }
 
-    dev->conf = OSDynamicCast(OSDictionary, provider->getProperty("Sensors"));
+    dev->conf = sensors;
+    sensors->release();
     dictionary->release();
     return dev;
 }

diff --git a/YogaSMC/YogaSMC/ThinkSMC.cpp b/YogaSMC/YogaSMC/ThinkSMC.cpp
@@ -14,7 +14,9 @@ OSDefineMetaClassAndStructors(ThinkSMC, YogaSMC);
 ThinkSMC* ThinkSMC::withDevice(IOService *provider, IOACPIPlatformDevice *device) {
     ThinkSMC* dev = OSTypeAlloc(ThinkSMC);
 
-    OSDictionary* dictionary = OSDictionary::withCapacity(1);
+    OSDictionary *dictionary = OSDictionary::withCapacity(1);
+    OSDictionary *sensors = OSDictionary::withDictionary(OSDynamicCast(OSDictionary, provider->getProperty("Sensors")));
+    dictionary->setObject("Sensors", sensors);
 
     dev->ec = device;
 
@@ -23,7 +25,8 @@ ThinkSMC* ThinkSMC::withDevice(IOService *provider, IOACPIPlatformDevice *device
         OSSafeReleaseNULL(dev);
     }
 
-    dev->conf = OSDynamicCast(OSDictionary, provider->getProperty("Sensors"));
+    dev->conf = sensors;
+    sensors->release();
     dictionary->release();
     return dev;
 }

diff --git a/YogaSMC/YogaVPC/ThinkVPC.cpp b/YogaSMC/YogaVPC/ThinkVPC.cpp
@@ -855,7 +855,9 @@ bool ThinkVPC::setBacklight(UInt32 level) {
 }
 
 bool ThinkVPC::setSSTStatus(UInt32 value) {
+#ifdef DEBUG
     char const *property[5] = {"Indicator off", "Working", "Waking", "Sleeping", "Hibernating"};
+#endif
     if (vpc->validateObject("CSSI") == kIOReturnSuccess) {
         OSObject* params[] = {
             OSNumber::withNumber(value, 32)