Add subscribe null check

joonhaengHeo · Apr 13, 2023 · 994c73e · 994c73e
1 parent dd40779
commit 994c73e
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice.mm b/src/darwin/Framework/CHIP/MTRBaseDevice.mm
@@ -1395,6 +1395,14 @@ - (void)subscribeToAttributePaths:(NSArray<MTRAttributeRequestPath *> * _Nullabl
                    if (attributes != nil) {
                        container.pathParams = static_cast<AttributePathParams *>(
                            Platform::MemoryCalloc([attributes count], sizeof(AttributePathParams)));
+                       if (container.pathParams == nullptr) {
+                           if (reportHandler) {
+                               dispatch_async(queue, ^{
+                                   reportHandler(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_NO_MEMORY]);
+                               });
+                           }
+                           return;
+                       }
                        for (MTRAttributeRequestPath * attribute in attributes) {
                            [attribute convertToAttributePathParams:container.pathParams[attributePathSize++]];
                        }
@@ -1403,6 +1411,14 @@ - (void)subscribeToAttributePaths:(NSArray<MTRAttributeRequestPath *> * _Nullabl
                    if (events != nil) {
                        container.eventPathParams
                            = static_cast<EventPathParams *>(Platform::MemoryCalloc([events count], sizeof(EventPathParams)));
+                       if (container.eventPathParams == nullptr) {
+                           if (reportHandler) {
+                               dispatch_async(queue, ^{
+                                   reportHandler(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_NO_MEMORY]);
+                               });
+                           }
+                           return;
+                       }
                        for (MTREventRequestPath * event in events) {
                            [event convertToEventPathParams:container.eventPathParams[eventPathSize++]];
                        }