Fixing crashes when comparing objects to nil (project-chip#34321)

* Fixing nil check crashes * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>
j-ororke · Sep 16, 2024 · 18247af · 18247af
1 parent ec2a50b
commit 18247af
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice.mm b/src/darwin/Framework/CHIP/MTRBaseDevice.mm
@@ -2290,9 +2290,12 @@ + (MTRAttributeRequestPath *)requestPathWithEndpointID:(NSNumber * _Nullable)end
 
 - (BOOL)isEqualToAttributeRequestPath:(MTRAttributeRequestPath *)path
 {
-    return MTREqualObjects(_endpoint, path.endpoint)
-        && MTREqualObjects(_cluster, path.cluster)
-        && MTREqualObjects(_attribute, path.attribute);
+    if (!path)
+        return NO;
+
+    return (path.endpoint && [_endpoint isEqualToNumber:path.endpoint])
+        && (path.cluster && [_cluster isEqualToNumber:path.cluster])
+        && (path.attribute && [_attribute isEqualToNumber:path.attribute]);
 }
 
 - (BOOL)isEqual:(id)object
@@ -2414,9 +2417,12 @@ + (MTREventRequestPath *)requestPathWithEndpointID:(NSNumber * _Nullable)endpoin
 
 - (BOOL)isEqualToEventRequestPath:(MTREventRequestPath *)path
 {
-    return MTREqualObjects(_endpoint, path.endpoint)
-        && MTREqualObjects(_cluster, path.cluster)
-        && MTREqualObjects(_event, path.event);
+    if (!path)
+        return NO;
+
+    return (path.endpoint && [_endpoint isEqualToNumber:path.endpoint])
+        && (path.cluster && [_cluster isEqualToNumber:path.cluster])
+        && (path.event && [_event isEqualToNumber:path.event]);
 }
 
 - (BOOL)isEqual:(id)object
@@ -2535,8 +2541,11 @@ ConcreteClusterPath path(static_cast<chip::EndpointId>([endpointID unsignedShort
 
 - (BOOL)isEqualToClusterPath:(MTRClusterPath *)clusterPath
 {
-    return MTREqualObjects(_endpoint, clusterPath.endpoint)
-        && MTREqualObjects(_cluster, clusterPath.cluster);
+    if (!clusterPath)
+        return NO;
+
+    return (clusterPath.endpoint && [_endpoint isEqualToNumber:clusterPath.endpoint])
+        && (clusterPath.cluster && [_cluster isEqualToNumber:clusterPath.cluster]);
 }
 
 - (BOOL)isEqual:(id)object
@@ -2624,7 +2633,10 @@ ConcreteDataAttributePath path(static_cast<chip::EndpointId>([endpointID unsigne
 
 - (BOOL)isEqualToAttributePath:(MTRAttributePath *)attributePath
 {
-    return [self isEqualToClusterPath:attributePath] && MTREqualObjects(_attribute, attributePath.attribute);
+    if (!attributePath)
+        return NO;
+
+    return [self isEqualToClusterPath:attributePath] && attributePath.attribute && [_attribute isEqualToNumber:attributePath.attribute];
 }
 
 - (BOOL)isEqual:(id)object
@@ -2717,7 +2729,10 @@ ConcreteEventPath path(static_cast<chip::EndpointId>([endpointID unsignedShortVa
 
 - (BOOL)isEqualToEventPath:(MTREventPath *)eventPath
 {
-    return [self isEqualToClusterPath:eventPath] && MTREqualObjects(_event, eventPath.event);
+    if (!eventPath)
+        return NO;
+
+    return [self isEqualToClusterPath:eventPath] && eventPath.event && [_event isEqualToNumber:eventPath.event];
 }
 
 - (BOOL)isEqual:(id)object
@@ -2807,7 +2822,10 @@ ConcreteCommandPath path(static_cast<chip::EndpointId>([endpointID unsignedShort
 
 - (BOOL)isEqualToCommandPath:(MTRCommandPath *)commandPath
 {
-    return [self isEqualToClusterPath:commandPath] && MTREqualObjects(_command, commandPath.command);
+    if (!commandPath)
+        return NO;
+
+    return [self isEqualToClusterPath:commandPath] && commandPath.command && [_command isEqualToNumber:commandPath.command];
 }
 
 - (BOOL)isEqual:(id)object

diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -196,8 +196,11 @@ - (id)copyWithZone:(NSZone *)zone
 
 - (BOOL)isEqualToClusterData:(MTRDeviceClusterData *)otherClusterData
 {
-    return MTREqualObjects(_dataVersion, otherClusterData.dataVersion)
-        && MTREqualObjects(_attributes, otherClusterData.attributes);
+    if (!otherClusterData)
+        return NO;
+
+    return (otherClusterData.dataVersion && [_dataVersion isEqual:otherClusterData.dataVersion])
+        && (otherClusterData.attributes && [_attributes isEqual:otherClusterData.attributes]);
 }
 
 - (BOOL)isEqual:(id)object