Handle string conversion

Author: briantu

pkg/inventory/systeminfo/collector_darwin.go

@@ -27,13 +27,28 @@ func collect() (*SystemInfo, error) {
 	defer C.free(unsafe.Pointer(cInfo.productName))
 	defer C.free(unsafe.Pointer(cInfo.serialNumber))
 
+	// Safely convert C strings to Go strings, handling NULL pointers
+	var modelNumber, serialNumber, modelName, identifier string
+	if cInfo.modelNumber != nil {
+		modelNumber = C.GoString(cInfo.modelNumber)
+	}
+	if cInfo.serialNumber != nil {
+		serialNumber = C.GoString(cInfo.serialNumber)
+	}
+	if cInfo.productName != nil {
+		modelName = C.GoString(cInfo.productName)
+	}
+	if cInfo.modelIdentifier != nil {
+		identifier = C.GoString(cInfo.modelIdentifier)
+	}
+
 	return &SystemInfo{
 		Manufacturer: "Apple Inc.",
-		ModelNumber:  C.GoString(cInfo.modelNumber),
-		SerialNumber: C.GoString(cInfo.serialNumber),
-		ModelName:    C.GoString(cInfo.productName),
-		ChassisType:  getChassisType(C.GoString(cInfo.productName), C.GoString(cInfo.modelIdentifier)),
-		Identifier:   C.GoString(cInfo.modelIdentifier),
+		ModelNumber:  modelNumber,
+		SerialNumber: serialNumber,
+		ModelName:    modelName,
+		ChassisType:  getChassisType(modelName, identifier),
+		Identifier:   identifier,
 	}, nil
 }
 

pkg/inventory/systeminfo/systeminfo_darwin.m

@@ -46,18 +46,23 @@ DeviceInfo getDeviceInfo(void) {
                 asprintf(&info.modelNumber, "%s%s", modelNum, region);
                 free(modelNum);
                 free(region);
-            } else {
+            } else if (modelNum) {
                 info.modelNumber = modelNum;
-                free(region);
             }
+            // Note: info.modelNumber remains NULL if modelNum was NULL, which is acceptable
         }
 
         NSDictionary *product = getServiceProperties(IOServiceNameMatching("product"));
         if (product) {
             info.productName = copyStringProperty(product, @"product-name");
         }
         if (!product || !info.productName) {
-            info.productName = strdup(info.modelIdentifier);
+            // Fallback to modelIdentifier if available, otherwise use empty string
+            if (info.modelIdentifier) {
+                info.productName = strdup(info.modelIdentifier);
+            } else {
+                info.productName = strdup("");
+            }
         }
 
         return info;