Check CFGetTypeID for GetProperty on MacOS

jcjones · jcjones · commit c270f8503827 · 2020-08-10T14:49:25.000-07:00
diff --git a/src/macos/device.rs b/src/macos/device.rs
@@ -54,6 +54,16 @@ impl Device {
             ));
         }
 
+        if CFGetTypeID(prop_ref) != CFStringGetTypeID() {
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidInput,
+                format!(
+                    "IOHIDDeviceGetProperty returned non-string type for property {}",
+                    prop_name
+                ),
+            ));
+        }
+
         Ok(CFString::from_void(prop_ref).to_string())
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,16 @@ impl Device {`
`54`	`54`	`));`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ if CFGetTypeID(prop_ref) != CFStringGetTypeID() {`
	`58`	`+ return Err(io::Error::new(`
	`59`	`+ io::ErrorKind::InvalidInput,`
	`60`	`+ format!(`
	`61`	`+ "IOHIDDeviceGetProperty returned non-string type for property {}",`
	`62`	`+ prop_name`
	`63`	`+ ),`
	`64`	`+ ));`
	`65`	`+ }`
	`66`	`+`
`57`	`67`	`Ok(CFString::from_void(prop_ref).to_string())`
`58`	`68`	`}`
`59`	`69`	`}`