fix(device_info_plus): fix memory leak when calling DeviceInfoPlugin().macOsInfo (#3474)

codingiran · miquelbeltran · web-flow · commit 1cbf2b562146 · 2025-02-20T07:46:37.000+01:00
Co-authored-by: Miguel Beltran &lt;m@beltran.work&gt;
diff --git a/packages/device_info_plus/device_info_plus/macos/device_info_plus/Sources/device_info_plus/SystemUUID.swift b/packages/device_info_plus/device_info_plus/macos/device_info_plus/Sources/device_info_plus/SystemUUID.swift
@@ -1,23 +1,16 @@
 import Foundation
 
-public struct SystemUUID {
-    
+public enum SystemUUID {
     public static func getSystemUUID() -> String? {
-        let dev = IOServiceMatching("IOPlatformExpertDevice")
-        
-        var platformExpert: io_service_t
-        if #available(macOS 12, *) {
-            platformExpert = IOServiceGetMatchingService(kIOMainPortDefault, dev)
+        let mainPort: mach_port_t
+        if #available(macOS 12.0, *) {
+            mainPort = kIOMainPortDefault
         } else {
-            platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, dev)
+            mainPort = kIOMasterPortDefault
         }
-        
-        let serialNumberAsCFString = IORegistryEntryCreateCFProperty(platformExpert, kIOPlatformUUIDKey as CFString, kCFAllocatorDefault, 0)
-        IOObjectRelease(platformExpert)
-        let ser: CFTypeRef? = serialNumberAsCFString?.takeUnretainedValue()
-        if let result = ser as? String {
-            return result
-        }
-        return nil
+        let service = IOServiceGetMatchingService(mainPort, IOServiceMatching("IOPlatformExpertDevice"))
+        let uuid = IORegistryEntryCreateCFProperty(service, kIOPlatformUUIDKey as CFString, kCFAllocatorDefault, 0).takeRetainedValue() as? String
+        IOObjectRelease(service)
+        return uuid
     }
 }
